diff --git a/web/js/file_manager.js b/web/js/file_manager.js
index 008d13bc..d6b93501 100644
--- a/web/js/file_manager.js
+++ b/web/js/file_manager.js
@@ -339,7 +339,6 @@ FM.updateTopLevelPathBar = function(box, tab, path) {
         if (part.trim() == '') {
             return;
         }
-        console.log("part - " + part);
         formattedPath.push('<a href="javascript:void(0)" onClick="FM.open(\''+part+'\', \''+box+'\')">'+part+'</span>');
     });
 
@@ -1043,9 +1042,12 @@ FM.itemIsArchieve = function(item) {
 FM.unpackItem = function() {
     var tab = FM.getTabLetter(FM.CURRENT_TAB);
     var box = FM['TAB_' + tab];
-    var selected = $(FM['TAB_' + tab] ).find('.dir.selected');
+    var selected = $(FM['TAB_' + tab] ).find('.dir.active');
     if (selected.length == 0) {
-        return alert('No file selected');
+        //return alert('No file selected');
+        return FM.displayError(
+            App.Constants.FM_NO_FILE_SELECTED
+        );
     }
     
 
@@ -1078,7 +1080,7 @@ FM.unpackItem = function() {
 FM.packItem = function() {
     var tab = FM.getTabLetter(FM.CURRENT_TAB);
     var box = FM['TAB_' + tab];
-    var selected = $(FM['TAB_' + tab] ).find('.dir.selected');
+    var selected = $(FM['TAB_' + tab] ).find('.dir.active');
     if (selected.length == 0) {
         return FM.displayError(
             App.Constants.FM_NO_FILE_SELECTED
@@ -1206,7 +1208,7 @@ FM.confirmRename = function() {
 
 FM.renameItems = function() {
     var tab = FM.getTabLetter(FM.CURRENT_TAB);
-    var selected = $(FM['TAB_' + tab] ).find('.dir.selected');
+    var selected = $(FM['TAB_' + tab] ).find('.dir.active');
     if (selected.length == 0) {
         return FM.displayError(
             App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
@@ -1440,7 +1442,7 @@ FM.confirmCopyItems = function () {
 
 FM.downloadFiles = function() {
     var tab = FM.getTabLetter(FM.CURRENT_TAB);
-    var selected = $(FM['TAB_' + tab] ).find('.dir.selected');
+    var selected = $(FM['TAB_' + tab] ).find('.dir.active');
     if (!selected) {
         return FM.displayError(
             App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
@@ -1451,7 +1453,10 @@ FM.downloadFiles = function() {
     src = $.parseJSON(src);
     
     if (FM.isItemPseudo(src) || FM.isItemDir(src)) {
-        alert('Folder downloads are in progress atm');
+        //alert('Folder downloads are in progress atm');
+        return FM.displayError(
+            App.Constants.FM_DIRECTORY_DOWNLOAD_NOT_READY
+        );
     }
     
     if (FM.isItemPseudo(src)) {
@@ -1769,6 +1774,8 @@ $(document).ready(function() {
 
 
     shortcut.add("Esc",function() {
+		FM.Env.RELOAD_IN_TIME = false;
+        $('#reload-in-time').remove();
         if (FM.isPopupOpened()) {
             return FM.handlePopupCancel();
         }
diff --git a/web/js/i18n.js.php b/web/js/i18n.js.php
index 0ca35378..dc795234 100644
--- a/web/js/i18n.js.php
+++ b/web/js/i18n.js.php
@@ -52,6 +52,7 @@ App.Constants.FM_FILE_NAME_CANNOT_BE_EMPTY      = '<?php echo __('File name cann
 App.Constants.FM_NO_FILE_SELECTED               = '<?php echo __('No file selected') ?>';
 App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED  = '<?php echo __('No file or folder selected') ?>';
 App.Constants.FM_FILE_TYPE_NOT_SUPPORTED        = '<?php echo __('File type not supported') ?>';
+App.Constants.FM_DIRECTORY_DOWNLOAD_NOT_READY   = '<?php echo __('Directory download not available in current version') ?>';
 
 App.Constants.FM_DIRECTORY_NOT_AVAILABLE        = '<?php echo __('Directory not available') ?>';
 App.Constants.FM_DONE                           = '<?php echo __('Done') ?>';
diff --git a/web/templates/file_manager/main.php b/web/templates/file_manager/main.php
index 1e1dea2f..8a533a02 100644
--- a/web/templates/file_manager/main.php
+++ b/web/templates/file_manager/main.php
@@ -449,23 +449,27 @@
             $(".listing-left").selectable({
                 selected: function (event, ui) {
                     FM.setTabActive(FM.TAB_A, 'skip_highlights');
-                    $(".listing-left .selected").each(function(i, o) {
+                    $(".listing-left .selected, .listing-left .ui-selectee").each(function(i, o) {
                         if (!$(o).hasClass('ui-selected')) {
                             $(o).removeClass('selected');
+                            $(o).removeClass('active');
                         }
                     });
                     $(ui.selected).addClass('selected');
+                    $(ui.selected).addClass('active');
                     checkIfArchive(ui.selected);
                     $(".listing-left .ui-selected").addClass('selected');
                 },
                 unselected: function (event, ui) {
-                    $(".listing-left .selected").each(function(i, o) {
+                    $(".listing-left .selected, .listing-left .ui-selectee").each(function(i, o) {
                         if (!$(o).hasClass('ui-selected')) {
                             $(o).removeClass('selected');
+                            $(o).removeClass('active');
                         }
                     });
                     FM.setTabActive(FM.TAB_A, 'skip_highlights');
                     $(ui.unselected).removeClass('selected');
+                    $(ui.selected).addClass('active');
                 }
             });
             $(".listing-right").selectable({