diff --git a/includes/theme.inc b/includes/theme.inc
index c59a7f11f6187358a40aeb359e40b7fbb6224d42..f22a775c0e75896a25f5d5241dec631d0859b322 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -233,6 +233,11 @@ function theme_get_settings($key = NULL) {
     $settings = array_merge($settings, variable_get(str_replace('/', '_', 'theme_'. $key .'_settings'), array()));
   }
 
+  // Only offer search box if search.module is enabled.
+  if (!module_exist('search')) {
+    $settings['toggle_search'] = 0;
+  }
+
   return $settings;
 }
 
diff --git a/modules/system.module b/modules/system.module
index b955cdd8925fdc839c6bfd4d23b1fc24011733e0..dc0b6bba0fb740cd6539b902c8cd9db8f5e4e81d 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -659,13 +659,16 @@ function system_theme_settings() {
 
   // Toggle settings
   $toggles = array('toggle_name' => t('Site name'),
-        'toggle_search' => t('Search box'),
         'toggle_slogan' => t('Site slogan'),
         'toggle_mission' => t('Mission statement'),
         'toggle_primary_links' => t('Primary links'),
         'toggle_secondary_links' => t('Secondary links'),
         'toggle_node_user_picture' => t('User pictures in posts'),
         'toggle_comment_user_picture' => t('User pictures in comments'));
+  // Only offer search box if search;module is enabled.
+  if (module_exist('search')) {
+    $toggles['toggle_search'] = t('Search box');
+  }
 
   foreach ($toggles as $name => $title) {
     if ((!$key) || in_array($name, $features)) {
diff --git a/modules/system/system.module b/modules/system/system.module
index b955cdd8925fdc839c6bfd4d23b1fc24011733e0..dc0b6bba0fb740cd6539b902c8cd9db8f5e4e81d 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -659,13 +659,16 @@ function system_theme_settings() {
 
   // Toggle settings
   $toggles = array('toggle_name' => t('Site name'),
-        'toggle_search' => t('Search box'),
         'toggle_slogan' => t('Site slogan'),
         'toggle_mission' => t('Mission statement'),
         'toggle_primary_links' => t('Primary links'),
         'toggle_secondary_links' => t('Secondary links'),
         'toggle_node_user_picture' => t('User pictures in posts'),
         'toggle_comment_user_picture' => t('User pictures in comments'));
+  // Only offer search box if search;module is enabled.
+  if (module_exist('search')) {
+    $toggles['toggle_search'] = t('Search box');
+  }
 
   foreach ($toggles as $name => $title) {
     if ((!$key) || in_array($name, $features)) {