diff --git a/app/Repositories/Daemon/FileRepository.php b/app/Repositories/Daemon/FileRepository.php
index b4fb2e3d4..e57a543c8 100644
--- a/app/Repositories/Daemon/FileRepository.php
+++ b/app/Repositories/Daemon/FileRepository.php
@@ -185,7 +185,8 @@ class FileRepository
                     'entry' => $value->name,
                     'directory' => trim($directory, '/'),
                     'size' => null,
-                    'date' => strtotime($value->modified)
+                    'date' => strtotime($value->modified),
+                    'mime' => $value->mime
                 ]]);
 
             } else if ($value->file === true) {
@@ -195,7 +196,8 @@ class FileRepository
                     'directory' => trim($directory, '/'),
                     'extension' => pathinfo($value->name, PATHINFO_EXTENSION),
                     'size' => HelperRepository::bytesToHuman($value->size),
-                    'date' => strtotime($value->modified)
+                    'date' => strtotime($value->modified),
+                    'mime' => $value->mime
                 ]]);
 
             }
diff --git a/resources/views/server/files/index.blade.php b/resources/views/server/files/index.blade.php
index 482b062de..d02aad964 100644
--- a/resources/views/server/files/index.blade.php
+++ b/resources/views/server/files/index.blade.php
@@ -56,14 +56,6 @@
             </div>
         </div>
     </div>
-    <ul id="fileOptionMenu" class="dropdown-menu" role="menu" style="display:none" >
-        <li data-action="move"><a tabindex="-1" href="#"><i class="fa fa-arrow-right"></i> Move</a></li>
-        <li data-action="rename"><a tabindex="-1" href="#"><i class="fa fa-pencil-square-o"></i> Rename</a></li>
-        <li><a tabindex="-1" href="#"><i class="fa fa-file-archive-o"></i> Compress</a></li>
-        <li class="divider"></li>
-        <li><a tabindex="-1" href="#"><i class="fa fa-download"></i> Download</a></li>
-        <li><a tabindex="-1" href="#"><i class="fa fa-trash-o"></i> Delete</a></li>
-    </ul>
 </div>
 <script src="{{ route('server.js', [$server->uuidShort, 'filemanager', 'index.js']) }}"></script>
 <script src="{{ route('server.js', [$server->uuidShort, 'filemanager', 'actions.js']) }}"></script>
diff --git a/resources/views/server/files/list.blade.php b/resources/views/server/files/list.blade.php
index 7034ac5cc..df850f9c5 100644
--- a/resources/views/server/files/list.blade.php
+++ b/resources/views/server/files/list.blade.php
@@ -30,7 +30,7 @@
     </thead>
     <tbody>
         @if (isset($directory['first']) && $directory['first'] === true)
-            <tr>
+            <tr data-type="disabled">
                 <td><i class="fa fa-folder-open" style="margin-left: 0.859px;"></i></td>
                 <td><a href="/server/{{ $server->uuidShort }}/files" data-action="directory-view">&larr;</a></a></td>
                 <td></td>
@@ -39,7 +39,7 @@
             </tr>
         @endif
         @if (isset($directory['show']) && $directory['show'] === true)
-            <tr>
+            <tr data-type="disabled">
                 <td><i class="fa fa-folder-open" style="margin-left: 0.859px;"></i></td>
                 <td><a href="/server/{{ $server->uuidShort }}/files?dir={{ rawurlencode($directory['link']) }}" data-action="directory-view">&larr; {{ $directory['link_show'] }}</a></a></td>
                 <td></td>
@@ -48,9 +48,11 @@
             </tr>
         @endif
         @foreach ($folders as $folder)
-            <tr class="align-middle" data-path="@if($folder['directory'] !== ''){{ rawurlencode($folder['directory']) }}/@endif{{ rawurlencode($folder['entry']) }}">
+            <tr class="align-middle" data-type="folder" data-path="@if($folder['directory'] !== ''){{ rawurlencode($folder['directory']) }}/@endif{{ rawurlencode($folder['entry']) }}">
                 <td data-identifier="type"><i class="fa fa-folder-open" style="margin-left: 0.859px;"></i></td>
-                <td data-identifier="name" data-hash="@if($folder['directory'] !== ''){{ rawurlencode($folder['directory']) }}/@endif{{ rawurlencode($folder['entry']) }}"><a href="/server/{{ $server->uuidShort }}/files" data-action="directory-view">{{ $folder['entry'] }}</a></td>
+                <td data-identifier="name" data-hash="@if($folder['directory'] !== ''){{ rawurlencode($folder['directory']) }}/@endif{{ rawurlencode($folder['entry']) }}">
+                    <a href="/server/{{ $server->uuidShort }}/files" data-action="directory-view">{{ $folder['entry'] }}</a>
+                </td>
                 <td data-identifier="size">{{ $folder['size'] }}</td>
                 <td data-identifier="modified">{{ date('m/d/y H:i:s', $folder['date']) }}</td>
                 {{-- <td class="text-center">
@@ -68,9 +70,9 @@
             </tr>
         @endforeach
         @foreach ($files as $file)
-            <tr class="align-middle">
-                <td><i class="fa fa-file-text" style="margin-left: 2px;"></i></td>
-                <td>
+            <tr class="align-middle" data-type="file" data-mime="{{ $file['mime'] }}">
+                <td data-identifier="type"><i class="fa fa-file-text" style="margin-left: 2px;"></i></td>
+                <td data-identifier="name" data-hash="@if($file['directory'] !== ''){{ rawurlencode($file['directory']) }}/@endif{{ rawurlencode($file['entry']) }}">
                     @if(in_array($file['extension'], $extensions))
                         @can('edit-files', $server)
                             <a href="/server/{{ $server->uuidShort }}/files/edit/@if($file['directory'] !== ''){{ rawurlencode($file['directory']) }}/@endif{{ rawurlencode($file['entry']) }}" class="edit_file">{{ $file['entry'] }}</a>
@@ -81,8 +83,8 @@
                         {{ $file['entry'] }}
                     @endif
                 </td>
-                <td>{{ $file['size'] }}</td>
-                <td>{{ date('m/d/y H:i:s', $file['date']) }}</td>
+                <td data-identifier="size">{{ $file['size'] }}</td>
+                <td data-identifier="modified">{{ date('m/d/y H:i:s', $file['date']) }}</td>
                 {{-- <td style="text-align:center;">
                     <div class="row" style="text-align:center;">
                         <div class="col-md-3 hidden-xs hidden-sm">
diff --git a/resources/views/server/js/filemanager/actions.blade.php b/resources/views/server/js/filemanager/actions.blade.php
index d82d4d46f..2eae52b04 100644
--- a/resources/views/server/js/filemanager/actions.blade.php
+++ b/resources/views/server/js/filemanager/actions.blade.php
@@ -29,30 +29,55 @@ class FileActions {
         this.rightClick();
     }
 
+    makeMenu() {
+        $(document).find('#fileOptionMenu').remove();
+        return $('<ul id="fileOptionMenu" class="dropdown-menu" role="menu" style="display:none" > \
+                    <li data-action="move"><a tabindex="-1" href="#"><i class="fa fa-arrow-right"></i> Move</a></li> \
+                    <li data-action="rename"><a tabindex="-1" href="#"><i class="fa fa-pencil-square-o"></i> Rename</a></li> \
+                    <li data-action="compress" class="hidden"><a tabindex="-1" href="#"><i class="fa fa-file-archive-o"></i> Compress</a></li> \
+                    <li data-action="decompress" class="hidden"><a tabindex="-1" href="#"><i class="fa fa-expand"></i> Decompress</a></li> \
+                    <li class="divider"></li> \
+                    <li data-action="download" class="hidden"><a tabindex="-1" href="#"><i class="fa fa-download"></i> Download</a></li> \
+                    <li data-action="delete"><a tabindex="-1" href="#"><i class="fa fa-trash-o"></i> Delete</a></li> \
+                </ul>');
+    }
+
     rightClick() {
         $('#file_listing > tbody').on('contextmenu', event => {
-            event.preventDefault();
-            const parent = $(event.target).parent();
 
-            $('#fileOptionMenu').appendTo('body');
-            $('#fileOptionMenu').data('invokedOn', $(event.target)).show().css({
+            const parent = $(event.target).parent();
+            const menu = this.makeMenu();
+
+            if (parent.data('type') === 'disabled') return;
+            event.preventDefault();
+
+            menu.appendTo('body');
+            menu.data('invokedOn', $(event.target)).show().css({
                 position: 'absolute',
                 left: event.pageX,
                 top: event.pageY,
             });
 
+            if (parent.data('type') === 'file') {
+                menu.find('li[data-action="download"]').removeClass('hidden');
+            }
+
+            if (_.without(['application/zip', 'application/gzip', 'application/x-gzip'], parent.data('mime')).length < 3) {
+                menu.find('li[data-action="decompress"]').removeClass('hidden');
+            }
+
             // Handle Events
             var Context = new ContextMenuActions(parent);
-            $('#fileOptionMenu li[data-action="move"]').unbind().on('click', e => {
+            menu.find('li[data-action="move"]').unbind().on('click', e => {
                 Context.move();
             });
 
-            $('#fileOptionMenu li[data-action="rename"]').unbind().on('click', e => {
+            menu.find('li[data-action="rename"]').unbind().on('click', e => {
                 Context.rename();
             });
 
-            $(window).click(() => {
-                $('#fileOptionMenu').hide();
+            $(window).on('click', () => {
+                menu.remove();
             });
         });
     }
diff --git a/resources/views/server/js/filemanager/index.blade.php b/resources/views/server/js/filemanager/index.blade.php
index 04c3295fa..78800c6ba 100644
--- a/resources/views/server/js/filemanager/index.blade.php
+++ b/resources/views/server/js/filemanager/index.blade.php
@@ -28,7 +28,7 @@ class FileManager {
         $('[data-toggle="tooltip"]').tooltip();
     }
 
-    list(path) {
+    list(path, isError) {
         if (_.isUndefined(path)) {
             path = this.decodeHash();
         }
@@ -54,7 +54,7 @@ class FileManager {
                 title: 'File Error',
                 text: 'An error occured while attempting to process this request. Please try again.',
             });
-            this.list('/');
+            if (!isError) this.list('/', true);
             console.log(jqXHR);
         }).always(() => {
             this.loader(false);