diff --git a/docs/upgrades/packages-7.7.11/root_import_survey_default-answer-edit.wgpkg b/docs/upgrades/packages-7.7.11/root_import_survey_default-answer-edit.wgpkg
new file mode 100644
index 000000000..73eb8069e
Binary files /dev/null and b/docs/upgrades/packages-7.7.11/root_import_survey_default-answer-edit.wgpkg differ
diff --git a/docs/upgrades/packages-7.7.11/root_import_survey_default-question-edit.wgpkg b/docs/upgrades/packages-7.7.11/root_import_survey_default-question-edit.wgpkg
new file mode 100644
index 000000000..321f92ead
Binary files /dev/null and b/docs/upgrades/packages-7.7.11/root_import_survey_default-question-edit.wgpkg differ
diff --git a/docs/upgrades/packages-7.7.11/root_import_survey_default-section-edit.wgpkg b/docs/upgrades/packages-7.7.11/root_import_survey_default-section-edit.wgpkg
new file mode 100644
index 000000000..cff973c34
Binary files /dev/null and b/docs/upgrades/packages-7.7.11/root_import_survey_default-section-edit.wgpkg differ
diff --git a/www/extras/wobject/Survey/editsurvey/object.js b/www/extras/wobject/Survey/editsurvey/object.js
index af896db70..cdaa4cd6d 100644
--- a/www/extras/wobject/Survey/editsurvey/object.js
+++ b/www/extras/wobject/Survey/editsurvey/object.js
@@ -141,7 +141,8 @@ Survey.ObjectTemplate = (function(){
                 width: "600px",
                 context: [document.body, 'tr', 'tr'],
                 visible: false,
-                buttons: btns
+                buttons: btns,
+                constrainToViewport: true
             });
 
             dialog.callback = Survey.Comm.callback;
@@ -168,11 +169,6 @@ Survey.ObjectTemplate = (function(){
             
             var textareaId = type + 'Text';
             var textarea = YAHOO.util.Dom.get(textareaId);
-            
-            var height = YAHOO.util.Dom.getStyle(textarea, 'height');
-            if (!height) {
-                height = '300px';
-            }
 
             dialog.show();
             initHoverHelp(type);