Index: lib/blocklib.php
===================================================================
--- lib/blocklib.php	(revision 17118)
+++ lib/blocklib.php	(revision )
@@ -347,7 +347,7 @@
         }
         $this->check_is_loaded();
         $this->ensure_content_created($region, $output);
-        if ($this->page->user_is_editing() && $this->page->user_can_edit_blocks()) {
+        if ($this->page->user_is_editing() && $this->page->user_can_edit_blocks() && $this->movingblock) {
             // If editing is on, we need all the block regions visible, for the
             // move blocks UI.
             return true;
@@ -455,7 +455,7 @@
         $this->check_is_loaded();
         $this->ensure_content_created($region, $output);
         foreach($this->visibleblockcontent[$region] as $instance) {
-            if (!empty($instance->content) && !get_user_preferences('docked_block_instance_'.$instance->blockinstanceid, 0)) {
+            if (!get_user_preferences('docked_block_instance_'.$instance->blockinstanceid, 0)) {
                 return false;
             }
         }