diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 2675b8998d..6686cebb74 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -137,7 +137,7 @@ require './libraries/Table.class.php';
  */
 require './libraries/Types.class.php';
 
-if (! defined('PMA_MINIMUM_COMMON')) {
+if (! defined('PMA_MINIMUM_COMMON') || defined('PMA_SETUP')) {
     /**
      * common functions
      */