--- modules/block/block.admin.inc	2008-11-24 01:00:02.000000000 -0600
+++ modules/block/block.adminNEW.inc	2010-05-10 07:41:28.000000000 -0500
@@ -145,11 +145,15 @@ function _block_compare($a, $b) {
  * Menu callback; displays the block configuration form.
  */
 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',