diff --git a/admin/survey/classes/class.LibraryBranching.php b/admin/survey/classes/class.LibraryBranching.php
index ded8e4ff0..a9b0e22ec 100644
--- a/admin/survey/classes/class.LibraryBranching.php
+++ b/admin/survey/classes/class.LibraryBranching.php
@@ -464,6 +464,7 @@ class LibraryBranching {
     private function displayRightQuestionItem($spremenljivka){
         global $lang;
         global $global_user_id;
+        global $admin_type;
 
         echo '<div id="question_item_holder_'.$spremenljivka['id'].'" class="question_item_holder" onClick="selectLibraryItem(\''.$spremenljivka['id'].'\');">';
 
@@ -498,6 +499,7 @@ class LibraryBranching {
     private function displayRightIfItem($if){
         global $lang;
         global $global_user_id;
+        global $admin_type;
 
         if($if['tip'] == 2){
             $type_string = '<span class="item_type">[LOOP]</span>';
diff --git a/admin/survey/script/library.js b/admin/survey/script/library.js
index 14a6ea303..6fbfcc3b2 100644
--- a/admin/survey/script/library.js
+++ b/admin/survey/script/library.js
@@ -267,6 +267,14 @@ function openLibraryFolder(folder_id){
     var tab = $('#active_tab').val();
 
     $("#lib_question_list").load('ajax.php?t=libraryBranching&a=displayLibraryQuestionList', {anketa: srv_meta_anketa_id, tab: tab, folder_id: folder_id});
+
+
+    // Ugasnemo vse prejšnje checkboxe
+    $(".question_item_check").removeClass('active').attr("checked", false);
+
+    // Nastavimo oznacene iteme na 0 in disablamo gumb
+    $('#selected_item_counter').html('0');
+    $("#insert_library_button").prop('disabled', true);
 }
 
 // Odpremo anketo - na desni prikazemo vprasanja
@@ -278,6 +286,14 @@ function openLibrarySurvey(folder_id, type){
     var tab = $('#active_tab').val();
 
     $("#lib_question_list").load('ajax.php?t=libraryBranching&a=displayLibrarySurveyQuestionList', {anketa: srv_meta_anketa_id, tab: tab, folder_id: folder_id});
+
+
+    // Ugasnemo vse prejšnje checkboxe
+    $(".question_item_check").removeClass('active').attr("checked", false);
+
+    // Nastavimo oznacene iteme na 0 in disablamo gumb
+    $('#selected_item_counter').html('0');
+    $("#insert_library_button").prop('disabled', true);
 }
 
 // Razpremo/skrcimo folder na levi
@@ -427,6 +443,8 @@ function deleteLibraryItem(item_id, item_type){
     $.post('ajax.php?t=libraryBranching&a=deleteItem', {anketa: srv_meta_anketa_id, item_id: item_id, item_type: item_type}, function(){
         $('#question_item_holder_'+item_id).remove();
     });
+
+    event.stopPropagation();
 }
 
 // Odpremo popup za dodajanje itema v knjiznico v urejanju ankete
@@ -436,6 +454,8 @@ function displayRenameLibraryItemPopup(item_id, type){
 
     $("#lib_additional_popup").fadeIn();
     $("#lib_additional_popup").load('ajax.php?t=libraryBranching&a=displayRenameLibraryItemPopup', {anketa: srv_meta_anketa_id, tab: tab, item_id: item_id, type: type});
+
+    event.stopPropagation();
 }
 
 // Preimenujemo obstojeci element