diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc
index 3fd8280..128196f 100644
--- a/modules/block/block.admin.inc
+++ b/modules/block/block.admin.inc
@@ -145,10 +145,13 @@ function _block_compare($a, $b) {
  */
 function block_admin_configure(&$form_state, $module = NULL, $delta = 0) {

+  global $theme_key;
+  init_theme();
+
   $form['module'] = array('#type' => 'value', '#value' => $module);
   $form['delta'] = array('#type' => 'value', '#value' => $delta);

-  $edit = db_fetch_array(db_query("SELECT pages, visibility, custom, title FROM {blocks} WHERE module = '%s' AND delta = '%s'", $module, $delta));
+  $edit = db_fetch_array(db_query("SELECT pages, visibility, custom, title FROM {blocks} WHERE module = '%s' AND delta = '%s' AND theme = '%s'", $module, $delta, $theme_key));

   $form['block_settings'] = array(
     '#type' => 'fieldset',