diff --git a/modules/system.module b/modules/system.module
index 8792336960f..9e0939b25cc 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -131,9 +131,11 @@ function system_menu($may_cache) {
       'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -1);
 
     foreach (list_themes() as $theme) {
-       $items[] = array('path' => 'admin/themes/settings/'. $theme->name, 'title' => $theme->name,
-       'callback' => 'system_theme_settings', 'callback arguments' => array($theme->name), 'access' => $access,
-       'type' => MENU_LOCAL_TASK);
+      if ($theme->status) {
+        $items[] = array('path' => 'admin/themes/settings/'. $theme->name, 'title' => $theme->name,
+        'callback' => 'system_theme_settings', 'callback arguments' => array($theme->name), 'access' => $access,
+        'type' => MENU_LOCAL_TASK);
+      }
     }
 
     // Modules:
diff --git a/modules/system/system.module b/modules/system/system.module
index 8792336960f..9e0939b25cc 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -131,9 +131,11 @@ function system_menu($may_cache) {
       'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -1);
 
     foreach (list_themes() as $theme) {
-       $items[] = array('path' => 'admin/themes/settings/'. $theme->name, 'title' => $theme->name,
-       'callback' => 'system_theme_settings', 'callback arguments' => array($theme->name), 'access' => $access,
-       'type' => MENU_LOCAL_TASK);
+      if ($theme->status) {
+        $items[] = array('path' => 'admin/themes/settings/'. $theme->name, 'title' => $theme->name,
+        'callback' => 'system_theme_settings', 'callback arguments' => array($theme->name), 'access' => $access,
+        'type' => MENU_LOCAL_TASK);
+      }
     }
 
     // Modules: