diff --git a/www/extras/wobject/Survey/editsurvey/object.js b/www/extras/wobject/Survey/editsurvey/object.js
index 80bdf569d..42e1b0fa9 100644
--- a/www/extras/wobject/Survey/editsurvey/object.js
+++ b/www/extras/wobject/Survey/editsurvey/object.js
@@ -146,8 +146,12 @@ Survey.ObjectTemplate = (function(){
                 visible: false,
                 buttons: btns
             });
-            
+
             dialog.callback = Survey.Comm.callback;
+
+            dialog.hideEvent.subscribe(function(){Survey.ObjectTemplate.hideEditor();});
+            dialog.dragEvent.subscribe(function(){Survey.ObjectTemplate.showEditor();});
+
             dialog.render();
 
             resizeGotoExpression = new YAHOO.util.Resize('resize_gotoExpression_formId');