diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php
index 9647b77ba40..0dc65c64cab 100644
--- a/blocks/moodleblock.class.php
+++ b/blocks/moodleblock.class.php
@@ -634,7 +634,11 @@ class block_base {
      * @todo finish documenting this function
      */
     function html_attributes() {
-        return array('id' => 'inst'.$this->instance->id, 'class' => 'block_'. $this->name());
+        return array(
+            'id' => 'inst'.$this->instance->id, 
+            'class' => 'block_'. $this->name().
+                ($this->edit_controls ? ' block_with_controls' :'')
+        );
     }
     
     /**