diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 88ee9a3c0..5aa123840 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -15,7 +15,7 @@
  - fixed #9943: Upgrade script fails with Payment Gateways
  - fixed #9948: Data form cannot be deleted.
  - fixed #9950: Wrong var in help for thread
-
+ - added Survey now has a loading mask on Survey edit ajax calls.
 7.6.14
  - fixed: IE6 shows Admin Bar over Asset Manager
  - fixed #9808: Search i18n 
diff --git a/docs/upgrades/packages-7.7.0/root_import_survey_default-survey-edit.wgpkg b/docs/upgrades/packages-7.7.0/root_import_survey_default-survey-edit.wgpkg
index 1b2f5d2be..844aafa6e 100644
Binary files a/docs/upgrades/packages-7.7.0/root_import_survey_default-survey-edit.wgpkg and b/docs/upgrades/packages-7.7.0/root_import_survey_default-survey-edit.wgpkg differ
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index 95282db7c..ce32730a9 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -377,7 +377,6 @@ Loads the initial edit survey page. All other edit actions are ajax calls from t
 
 sub www_editSurvey {
     my $self = shift;
-
     return $self->session->privilege->insufficient()
         if !$self->session->user->isInGroup( $self->get('groupToEditSurvey') );
 
@@ -398,7 +397,7 @@ See L<WebGUI::Asset::Wobject::Survey::ResponseJSON/sectionIndex>.
 
 sub www_submitObjectEdit {
     my $self = shift;
-
+    
     return $self->session->privilege->insufficient()
         if !$self->session->user->isInGroup( $self->get('groupToEditSurvey') );
 
@@ -674,7 +673,7 @@ If undef, the address is pulled form the form POST.
 sub www_loadSurvey {
     my ( $self, $options ) = @_;
     my $editflag = 1;
-
+sleep(2);
     my $address = defined $options->{address} ? $options->{address} : undef;
     if ( !defined $address ) {
         if ( my $inAddress = $self->session->form->process('data') ) {
diff --git a/www/extras/wobject/Survey/administersurvey.js b/www/extras/wobject/Survey/administersurvey.js
index a91b42696..4d4218568 100644
--- a/www/extras/wobject/Survey/administersurvey.js
+++ b/www/extras/wobject/Survey/administersurvey.js
@@ -353,6 +353,7 @@ if (typeof Survey === "undefined") {
                 }
                 else {
                     document.getElementById('questions').style.display = 'inline';
+console.log(2);
                     Survey.Form.addWidgets(qs);
                 }
                 lastSection = s.id;
@@ -361,6 +362,7 @@ if (typeof Survey === "undefined") {
                 document.getElementById('headertitle').style.display = 'block';
                 document.getElementById('headertext').style.display = 'block';
                 document.getElementById('questions').style.display = 'inline';
+console.log(3);
                 Survey.Form.addWidgets(qs);
             }
         },
diff --git a/www/extras/wobject/Survey/editsurvey/comm.js b/www/extras/wobject/Survey/editsurvey/comm.js
index a4c4b760d..dce40eb8d 100644
--- a/www/extras/wobject/Survey/editsurvey/comm.js
+++ b/www/extras/wobject/Survey/editsurvey/comm.js
@@ -6,6 +6,7 @@ Survey.Comm = new function(){
     var callMade = 0;
 
     var request = function(sUrl,callback,postData){
+        YAHOO.util.Dom.setStyle('mask-all','display','block');
         if(callMade == 1){
             alert("Waiting on previous request");
         }else{
@@ -15,6 +16,7 @@ Survey.Comm = new function(){
     }
     this.callback = {
         success:function(o){
+            YAHOO.util.Dom.setStyle('mask-all','display','none');
             callMade = 0;
             Survey.Data.loadData(YAHOO.lang.JSON.parse(o.responseText));
         },
diff --git a/www/extras/wobject/Survey/surveyedit.css b/www/extras/wobject/Survey/surveyedit.css
index 3ff5260fc..21ea03b2d 100644
--- a/www/extras/wobject/Survey/surveyedit.css
+++ b/www/extras/wobject/Survey/surveyedit.css
@@ -1,4 +1,38 @@
 
+#loading-mask {
+  position: absolute;
+  left:     0;
+  top:      0;
+  width:    100%;
+  height:   100%;
+  z-index:  20000;
+  background-color: white;
+  opacity:0.6;
+  filter:alpha(opacity=60);
+}
+
+#loading {
+  position: absolute;
+  left:     50%;
+  top:      50%;
+  padding:  2px;
+  z-index:  20001;
+  height:   auto;
+  margin:   -35px 0 0 -30px;
+}
+
+#loading .loading-indicator {
+  background: url(/extras/yui/rel_interstitial_loading.gif) no-repeat;
+  color:      #555;
+  font:       bold 13px tahoma,arial,helvetica;
+  padding:    18px 80px;
+  margin:     0;
+  text-align: center;
+  height:     auto;
+  z-index:  20002;
+}
+
+
 div.testarea {
     width: 200px;
     height: 100px;