diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
index 3627ed33c64..67bc1993a63 100644
--- a/application/helpers/common_helper.php
+++ b/application/helpers/common_helper.php
@@ -305,7 +305,7 @@ function isStandardTemplate($sTemplateName)
 * @return string This string is returned containing <option></option> formatted list of existing surveys
 *
 */
-function getSurveyList($returnarray=false, $returnwithouturl=false, $surveyid=false)
+function getSurveyList($returnarray=false, $surveyid=false)
 {
     static $cached = null;
 
@@ -356,13 +356,7 @@ function getSurveyList($returnarray=false, $returnwithouturl=false, $surveyid=fa
                 {
                     $inactivesurveys .= " selected='selected'"; $svexist = 1;
                 }
-                if ($returnwithouturl===false)
-                {
-                    $inactivesurveys .=" value='".Yii::app()->getController()->createUrl("/admin/survey/sa/view/surveyid/".$sv['sid'])."'>{$surveylstitle}</option>\n";
-                } else
-                {
-                    $inactivesurveys .=" value='{$sv['sid']}'>{$surveylstitle}</option>\n";
-                }
+                $inactivesurveys .=" value='{$sv['sid']}'>{$surveylstitle}</option>\n";
             } elseif($sv['expires']!='' && $sv['expires'] < dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i:s", $timeadjust))
             {
                 $expiredsurveys .="<option ";
@@ -374,13 +368,7 @@ function getSurveyList($returnarray=false, $returnwithouturl=false, $surveyid=fa
                 {
                     $expiredsurveys .= " selected='selected'"; $svexist = 1;
                 }
-                if ($returnwithouturl===false)
-                {
-                    $expiredsurveys .=" value='".Yii::app()->getController()->createUrl("/admin/survey/sa/view/surveyid/".$sv['sid'])."'>{$surveylstitle}</option>\n";
-                } else
-                {
-                    $expiredsurveys .=" value='{$sv['sid']}'>{$surveylstitle}</option>\n";
-                }
+                $expiredsurveys .=" value='{$sv['sid']}'>{$surveylstitle}</option>\n";
             } else
             {
                 $activesurveys .= "<option ";
@@ -392,16 +380,11 @@ function getSurveyList($returnarray=false, $returnwithouturl=false, $surveyid=fa
                 {
                     $activesurveys .= " selected='selected'"; $svexist = 1;
                 }
-                if ($returnwithouturl===false)
-                {
-                    $activesurveys .=" value='".Yii::app()->getController()->createUrl("/admin/survey/sa/view/surveyid/".$sv['sid'])."'>{$surveylstitle}</option>\n";
-                } else
-                {
-                    $activesurveys .=" value='{$sv['sid']}'>{$surveylstitle}</option>\n";
-                }
+                $activesurveys .=" value='{$sv['sid']}'>{$surveylstitle}</option>\n";
             }
         } // End Foreach
     }
+    
     //Only show each activesurvey group if there are some
     if ($activesurveys!='')
     {
@@ -423,13 +406,7 @@ function getSurveyList($returnarray=false, $returnwithouturl=false, $surveyid=fa
         $surveyselecter = "<option selected='selected' value=''>".$clang->gT("Please choose...")."</option>\n".$surveyselecter;
     } else
     {
-        if ($returnwithouturl===false)
-        {
-            $surveyselecter = "<option value='".Yii::app()->getController()->createUrl("/admin")."'>".$clang->gT("None")."</option>\n".$surveyselecter;
-        } else
-        {
-            $surveyselecter = "<option value=''>".$clang->gT("None")."</option>\n".$surveyselecter;
-        }
+        $surveyselecter = "<option value=''>".$clang->gT("None")."</option>\n".$surveyselecter;
     }
     return $surveyselecter;
 }
diff --git a/application/views/admin/super/adminmenu.php b/application/views/admin/super/adminmenu.php
index dd5f3241668..2b60ffaaea1 100644
--- a/application/views/admin/super/adminmenu.php
+++ b/application/views/admin/super/adminmenu.php
@@ -89,8 +89,8 @@
         </div>
         <div class='menubar-right'>
             <label for='surveylist'><?php $clang->eT("Surveys:");?></label>
-            <select id='surveylist' name='surveylist' onchange="window.open(this.options[this.selectedIndex].value,'_top')">
-                <?php echo getSurveyList(false, false, $surveyid); ?>
+            <select id='surveylist' name='surveylist' onchange="if (this.options[this.selectedIndex].value!='') {window.open('<?php echo $this->createUrl("/admin/survey/sa/view/surveyid/"); ?>/'+this.options[this.selectedIndex].value,'_top')} else {window.open('<?php echo $this->createUrl("/admin/survey/sa/index/");?>','_top')}">
+                <?php echo getSurveyList(false, $surveyid); ?>
             </select>
             <a href="<?php echo $this->createUrl("admin/survey/sa/index"); ?>">
                 <img src='<?php echo $sImageURL;?>surveylist.png' alt='<?php $clang->eT("Detailed list of surveys");?>' />
diff --git a/application/views/admin/survey/subview/tabCopy_view.php b/application/views/admin/survey/subview/tabCopy_view.php
index d2ec3b0fbfc..c0554eeb40c 100644
--- a/application/views/admin/survey/subview/tabCopy_view.php
+++ b/application/views/admin/survey/subview/tabCopy_view.php
@@ -3,7 +3,7 @@
         <ul>
             <li><label for='copysurveylist'><?php $clang->eT("Select survey to copy:"); ?> </label>
                 <select id='copysurveylist' name='copysurveylist' required="required">
-                    <?php echo getSurveyList(false, true); ?> </select> <span class='annotation'><?php echo $clang->gT("Required"); ?> </span></li>
+                    <?php echo getSurveyList(false); ?> </select> <span class='annotation'><?php echo $clang->gT("Required"); ?> </span></li>
             <li><label for='copysurveyname'><?php echo $clang->gT("New survey title:"); ?> </label>
                 <input type='text' id='copysurveyname' size='82' maxlength='200' name='copysurveyname' value='' required="required" />
                 <span class='annotation'><?php echo $clang->gT("Required"); ?> </span></li>
diff --git a/scripts/admin/listsurvey.js b/scripts/admin/listsurvey.js
index 039e3056514..8cc8de6b216 100644
--- a/scripts/admin/listsurvey.js
+++ b/scripts/admin/listsurvey.js
@@ -133,7 +133,8 @@ $(document).ready(function(){
                                                           del:true,
                                                           edit:false,
                                                           refresh: true,
-                                                          search: true
+                                                          search: true,
+
                                                         },{},{},{ msg:delmsg, 
                                                                   bSubmit: sDelCaption,
                                                                   caption: sDelCaption,
@@ -141,7 +142,18 @@ $(document).ready(function(){
                                                                   width : 450,
                                                                   afterShowForm: function(form) {
                                                                     form.closest('div.ui-jqdialog').center();
-                                                                  }
+                                                                  },
+                                                          afterSubmit: function(response, postdata) {
+                                                              if (postdata.oper=='del')
+                                                              {
+                                                                  // Remove surveys from dropdown, too
+                                                                    aSurveyIDs=postdata.id.split(",");
+                                                                    $.each(aSurveyIDs,function(iIndex, iSurveyID){
+                                                                        $("#surveylist option[value='"+iSurveyID+"']").remove();   
+                                                                    })
+                                                              };
+                                                              return [true];
+                                                          }
                                                                 },
                                                                 {
                                                                       caption: sSearchCaption,