diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index 08c94f8cc..f507129ba 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -94,19 +94,19 @@ app.controller('FileManagerController', ['$scope', '$timeout', 'Client', functio
 
     $scope.menuOptions = [
         {
-            text: 'Extract Here',
-            enabled: function ($itemScope, $event, entry) { return !entry.isDirectory && isArchive(entry.fileName); },
-            click: function ($itemScope, $event, entry) { extract(entry); }
-        }, {
-            text: 'Download',
-            enabled: function ($itemScope, $event, entry) { return !entry.isDirectory; },
-            click: function ($itemScope, $event, entry) { download(entry); }
-        }, {
             text: 'Rename',
             click: function ($itemScope, $event, entry) { $scope.renameEntry.show(entry); }
         }, {
             text: 'Change Ownership',
             click: function ($itemScope, $event, entry) { $scope.chownEntry.show(entry); }
+        }, {
+            text: 'Extract Here',
+            displayed: function ($itemScope, $event, entry) { return !entry.isDirectory && isArchive(entry.fileName); },
+            click: function ($itemScope, $event, entry) { extract(entry); }
+        }, {
+            text: 'Download',
+            displayed: function ($itemScope, $event, entry) { return !entry.isDirectory; },
+            click: function ($itemScope, $event, entry) { download(entry); }
         }, {
             text: 'Delete',
             hasTopDivider: true,