diff --git a/themekey.module b/themekey.module
index e45bc72..cb69cda 100644
--- a/themekey.module
+++ b/themekey.module
@@ -119,7 +119,7 @@ function themekey_init() {
     }
   }
   // don't change theme when administer blocks or during cron run executed by cron.php or drush
-  elseif (strpos($_GET['q'], 'admin/build/block') !== 0 && strpos($_SERVER['SCRIPT_FILENAME'], 'cron.php') === FALSE && strpos($_SERVER['SCRIPT_FILENAME'], 'drush.php') === FALSE) {
+  elseif ('admin/build/block' != $_GET['q'] && strpos($_GET['q'], 'admin/build/block/list') !== 0 && strpos($_SERVER['SCRIPT_FILENAME'], 'cron.php') === FALSE && strpos($_SERVER['SCRIPT_FILENAME'], 'drush.php') === FALSE) {
     // don't change theme when another module already set a $custom_theme like system.module does (administration theme) until administrator turns on this feature
     if (!$custom_theme || variable_get('themekey_override_custom_theme', 0)) {
       require_once(drupal_get_path('module', 'themekey') . '/themekey_base.inc');