diff --git a/admin/survey/classes/class.SurveyListFolders.php b/admin/survey/classes/class.SurveyListFolders.php
index 4b06436fa..eb930b747 100644
--- a/admin/survey/classes/class.SurveyListFolders.php
+++ b/admin/survey/classes/class.SurveyListFolders.php
@@ -163,6 +163,17 @@ class SurveyListFolders extends SurveyList{
 
             echo '<div class="folder_item_title">'.$lang['srv_mySurvey_all_surveys'].'</div>';  
             echo '<span class="folder_item_child_count">'.$survey_count.'</span>';
+
+            // Urejanje folderja
+            // Tri pikice za prikaz urejanja folderja
+            echo '  <span class="faicon dots_ver dots_ver_folder" onClick="mySurvey_folder_show_edit(this);"></span>';
+
+            // Skrit div za urejanje folderja
+            echo '  <div class="folder_item_settings displayNone">';
+            echo '      <ul>';
+            echo '          <li onClick="mySurvey_folder_add_popup(\''.$folder_id.'\');">'.$lang['srv_mySurvey_create_subfolder'].'</li>';
+            echo '      </ul>';
+            echo '  </div>';
         }
         else{            
             echo '<li id="folder_item_'.$folder_id.'" class="folder_item '.$folder_open.' '.$folder_active.' mySurvey_draggable mySurvey_droppable" folder_id="'.$folder_id.'" onClick="mySurvey_folder_activate(\''.$folder_id.'\');">';
@@ -1071,7 +1082,7 @@ class SurveyListFolders extends SurveyList{
             if($folder_id > 0){
 
                 // Dobimo parent folderja
-                $sqlParent = sisplet_query("SELECT parent FROM srv_mysurvey_folder WHERE id='".$folder_id."' AND usr_id='".$global_user_id."'");
+                $sqlParent = sisplet_query("SELECT parent, active FROM srv_mysurvey_folder WHERE id='".$folder_id."' AND usr_id='".$global_user_id."'");
                 $rowParent = mysqli_fetch_array($sqlParent);
 
                 // Ce je parent root, pobrisemo ankete ki so bile znotraj folderja
@@ -1081,16 +1092,21 @@ class SurveyListFolders extends SurveyList{
                 // Drugace jih prestavimo v parenta
                 else{
                     $sql = sisplet_query("UPDATE srv_mysurvey_anketa SET folder='".$rowParent['parent']."' WHERE folder='".$folder_id."' AND usr_id='".$global_user_id."'");
+
+                    // Ce je bil active, nastavimo parenta za active
+                    if($rowParent['active'] == '1'){
+                        $sql2 = sisplet_query("UPDATE srv_mysurvey_folder SET active='1' WHERE id='".$rowParent['parent']."' AND usr_id='".$global_user_id."'");
+                    }
                 }  
 
                 // Nastavimo subfolderjem novega parenta
-                $sql = sisplet_query("UPDATE srv_mysurvey_folder SET parent='".$rowParent['parent']."' WHERE parent='".$folder_id."' AND usr_id='".$global_user_id."'");
-                
+                $sql3 = sisplet_query("UPDATE srv_mysurvey_folder SET parent='".$rowParent['parent']."' WHERE parent='".$folder_id."' AND usr_id='".$global_user_id."'");
+                       
                 // Na koncu se pobrisemo prazen folder
-                $sql = sisplet_query("DELETE FROM srv_mysurvey_folder WHERE id='".$folder_id."' AND usr_id='".$global_user_id."'");
-                
-                // Rekurzivno pobrisemo vse poddirektorije z anketami - TODO!!!
+                $sql4 = sisplet_query("DELETE FROM srv_mysurvey_folder WHERE id='".$folder_id."' AND usr_id='".$global_user_id."'");
             }
+
+            $this->getSurveys();
 		}
 
 
diff --git a/admin/survey/script/surveyList.js b/admin/survey/script/surveyList.js
index c1a4c6aa8..bd6126b91 100644
--- a/admin/survey/script/surveyList.js
+++ b/admin/survey/script/surveyList.js
@@ -221,7 +221,7 @@ function mySurvey_folder_rename(folder_id){
 // Pobrisemo obstojeci folder
 function mySurvey_folder_delete(folder_id){
 
-    $("#left_content").load('ajax.php?t=surveyListFolders&a=mysurvey_folder_delete', {folder_id: folder_id});
+    $("#survey_list").load('ajax.php?t=surveyListFolders&a=mysurvey_folder_delete', {folder_id: folder_id});
 }