diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 09d6c5ac9..2f6167553 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -3551,7 +3551,7 @@ class SurveyAdmin
 
 
         // VSEBINA POSAMEZNEGA TABA PRI MOJIH ANKETAH 
-        echo '<div id="moje_ankete_edit" class="page_'.$_GET['a'].' subpage_'.$_GET['t'].' '.(isset($_GET['b']) ? 'subpage_b_'.$_GET['b'] : '').' '.($SLCount == 0 ? 'page_ustvari_anketo' : '').' '.($SLCount > 0 && $has_folders ? 'moje_ankete_folders' : '').' '.$this->layout_width.' '.$this->layout_menu.'">';
+        echo '<div id="moje_ankete_edit" class="page_'.$_GET['a'].' subpage_'.$_GET['t'].' '.(isset($_GET['b']) ? 'subpage_b_'.$_GET['b'] : '').' '.($SLCount == 0 ? 'page_ustvari_anketo' : '').' '.$this->layout_width.' '.$this->layout_menu.'">';
 
         // izpis pregledovanja
         if ((!isset($_GET['a']) && !isset($_GET['anketa'])) || ($_GET['a'] == 'pregledovanje')) { 
diff --git a/admin/survey/script/surveyList.js b/admin/survey/script/surveyList.js
index e1247c5d1..40f91c235 100644
--- a/admin/survey/script/surveyList.js
+++ b/admin/survey/script/surveyList.js
@@ -74,7 +74,6 @@ function switchFolder(show){
 		var show_folders = 1;
 
 	$('#survey_list').load('ajax.php?a=surveyList_folders', {show_folders:show_folders}, function(){
-        $('#moje_ankete_edit').toggleClass('moje_ankete_folders');
         $('body').toggleClass('body_mySurveys_folders');
         $('body').toggleClass('body_mySurveys');
     });
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 7fa901a1f..dcd2db652 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -11070,16 +11070,16 @@ body.eng #survey_list .filters #folderSwitch {
 body.body_mySurveys_folders {
   overflow-y: hidden;
 }
-body.body_mySurveys_folders .moje_ankete_folders {
+body.body_mySurveys_folders #moje_ankete_edit {
   margin-top: -64px !important;
   padding: 0 !important;
   max-width: 100% !important;
   overflow-y: hidden;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders {
   display: flex;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content {
   flex-shrink: 0;
   width: 320px;
   height: calc(100vh - 210px);
@@ -11087,20 +11087,20 @@ body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folde
   padding: 32px 16px;
   border-right: 1px #E5E5E5 solid;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content .title {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content .title {
   margin-bottom: 16px;
   font-weight: 600;
   font-size: 14px;
   text-transform: uppercase;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content > ul {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content > ul {
   margin-left: 0 !important;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul {
   margin: 0 0 0 16px;
   padding: 0;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item {
   cursor: pointer;
   position: relative;
   display: flex;
@@ -11115,58 +11115,58 @@ body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folde
   border-radius: 2px;
   transition: 0.2s;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .faicon.arrow:before {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .faicon.arrow:before {
   content: "";
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .faicon.folder:before,
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .faicon.clipboard:before {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .faicon.folder:before,
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .faicon.clipboard:before {
   font-weight: 400;
   color: #D3D3D3;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.active {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item.active {
   border-color: #1E88E5;
   background-color: #F8F8F8;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.active .faicon.folder:before,
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.active .faicon.clipboard:before {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item.active .faicon.folder:before,
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item.active .faicon.clipboard:before {
   font-weight: 600;
   color: #1E88E5;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.open .faicon.arrow:before {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item.open .faicon.arrow:before {
   content: "";
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.no_arrow .faicon.arrow:before {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item.no_arrow .faicon.arrow:before {
   display: none;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.mySurvey_droppable.folderhover {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item.mySurvey_droppable.folderhover {
   background-color: #E5E5E5;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item:hover {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item:hover {
   background-color: #F8F8F8;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item:hover .dots_ver {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item:hover .dots_ver {
   display: block;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item span {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item span {
   margin-right: 8px;
   font-size: 14px;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_child_count {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_child_count {
   margin-left: 8px;
   font-size: 12px;
   color: #777777;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .dots_ver {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .dots_ver {
   display: none;
   position: absolute;
   right: 0;
   padding: 7px 8px;
   margin-right: 0;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .dots_ver.active {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .dots_ver.active {
   display: block !important;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings {
   padding: 16px;
   color: #333333;
   font-weight: 400;
@@ -11182,35 +11182,35 @@ body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folde
   top: 38px;
   border-radius: 2px;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings a {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings a {
   text-decoration: none;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul {
   margin: 0;
   padding: 0;
   list-style-type: none;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li {
   margin-bottom: 16px;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li:last-of-type {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li:last-of-type {
   margin-bottom: 0;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li span {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li span {
   cursor: pointer;
   color: #333333;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li span:hover {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li span:hover {
   color: #1E88E5;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li {
   color: #1E88E5;
   transition: 0.2s;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li:hover {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li:hover {
   color: #0059ab;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content #mySurvey_additional_popup {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content #mySurvey_additional_popup {
   display: none;
   z-index: 9999;
   position: absolute !important;
@@ -11220,40 +11220,40 @@ body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folde
   border: 1px solid #C4C4C4;
   box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07);
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content #mySurvey_additional_popup input[type=text] {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content #mySurvey_additional_popup input[type=text] {
   width: 100%;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content {
   width: 100%;
   padding: 32px 16px;
   height: calc(100vh - 210px);
   overflow-y: auto;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content .folder_title {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .folder_title {
   margin-bottom: 24px;
   font-weight: 600;
   font-size: 16px;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content .folder_title .faicon.folder:before {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .folder_title .faicon.folder:before {
   margin-right: 8px;
   font-weight: 600;
   color: #1E88E5;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line {
   display: flex;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .create_buttons {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line .create_buttons {
   display: flex;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .filters {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line .filters {
   width: auto;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .filters #searchMySurveys {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line .filters #searchMySurveys {
   width: auto;
   margin-left: 16px;
 }
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .filters #searchMySurveys #searchMySurvey,
-body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .filters #searchMySurveys button {
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line .filters #searchMySurveys #searchMySurvey,
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line .filters #searchMySurveys button {
   height: 40px;
 }
 body.body_mySurveys_folders #survey_list .div_sl_new.folders table#surveyList_new tr.sl_header_new td {
diff --git a/resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss b/resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss
index 3b6a6ebc4..b44b854b6 100644
--- a/resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss
+++ b/resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss
@@ -5,7 +5,7 @@
 body.body_mySurveys_folders{
     overflow-y: hidden;
 
-    .moje_ankete_folders{
+    #moje_ankete_edit{
         margin-top: -64px !important;
         padding: 0 !important;