diff --git a/zen/template.block-editing.inc b/zen/template.block-editing.inc
index 8bb205c..9ec9b23 100644
--- a/zen/template.block-editing.inc
+++ b/zen/template.block-editing.inc
@@ -15,11 +15,12 @@
  *   The name of the template being rendered ("block" in this case.)
  */
 function zen_preprocess_block_editing(&$vars, $hook) {
+  global $theme_key;
   $block = $vars['block'];
 
   // Display 'edit block' for custom blocks.
   if ($block->module == 'block') {
-    $edit_links[] = l('<span>' . t('edit block') . '</span>', 'admin/build/block/configure/' . $block->module . '/' . $block->delta,
+    $edit_links[] = l('<span>' . t('edit block') . '</span>', 'admin/build/block/configure/' . $block->module . '/' . $block->delta .'/'. $theme_key,
       array(
         'attributes' => array(
           'title' => t('edit the content of this block'),
@@ -32,7 +33,7 @@ function zen_preprocess_block_editing(&$vars, $hook) {
   }
   // Display 'configure' for other blocks.
   else {
-    $edit_links[] = l('<span>' . t('configure') . '</span>', 'admin/build/block/configure/' . $block->module . '/' . $block->delta,
+    $edit_links[] = l('<span>' . t('configure') . '</span>', 'admin/build/block/configure/' . $block->module . '/' . $block->delta .'/'. $theme_key,
       array(
         'attributes' => array(
           'title' => t('configure this block'),