diff --git a/resources/assets/scripts/components/server/components/filemanager/FileRow.vue b/resources/assets/scripts/components/server/components/filemanager/FileRow.vue
index f3554451f..6a069d7fd 100644
--- a/resources/assets/scripts/components/server/components/filemanager/FileRow.vue
+++ b/resources/assets/scripts/components/server/components/filemanager/FileRow.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <div v-on:contextmenu="showContextMenu">
-            <div class="row" :class="{ clickable: canEdit(file), 'active-selection': contextMenuVisible }" v-if="!file.directory">
+            <div class="row" :class="{ 'cursor-pointer': canEdit(file), 'active-selection': contextMenuVisible }" v-if="!file.directory">
                 <div class="flex-none icon">
                     <Icon name="file-text" v-if="!file.symlink"/>
                     <Icon name="link2" v-else/>
@@ -9,9 +9,11 @@
                 <div class="flex-1">{{file.name}}</div>
                 <div class="flex-1 text-right text-neutral-600">{{readableSize(file.size)}}</div>
                 <div class="flex-1 text-right text-neutral-600">{{formatDate(file.modified)}}</div>
-                <div class="flex-none w-1/6"></div>
+                <div class="flex-none icon cursor-pointer" v-on:click="showContextMenu" ref="menuTriggerIcon">
+                    <Icon name="more-vertical" class="text-neutral-500"/>
+                </div>
             </div>
-            <router-link class="row clickable"
+            <router-link class="row"
                          :class="{ 'active-selection': contextMenuVisible }"
                          :to="{ name: 'server-files', params: { path: getClickablePath(file.name) }}"
                          v-else
@@ -22,9 +24,10 @@
                 <div class="flex-1">{{file.name}}</div>
                 <div class="flex-1 text-right text-neutral-600"></div>
                 <div class="flex-1 text-right text-neutral-600">{{formatDate(file.modified)}}</div>
-                <div class="flex-none w-1/6"></div>
+                <div class="flex-none icon" v-on:click="showContextMenu" ref="menuTriggerIcon">
+                    <Icon name="more-vertical" class="text-neutral-500"/>
+                </div>
             </router-link>
-
         </div>
         <FileContextMenu
             class="context-menu"
@@ -129,13 +132,14 @@
 
                 // @ts-ignore
                 this.$parent.$emit('collapse-menus', this._uid);
-
                 this.contextMenuVisible = true;
 
-                const menuWidth = (this.$refs.contextMenu as VueType).$el.clientWidth;
-                const positionElement = e.clientX - Math.round(menuWidth / 2);
+                this.$nextTick(() => {
+                    const menuWidth = (this.$refs.contextMenu as VueType).$el.clientWidth;
+                    const positionElement = e.clientX - Math.round(menuWidth / 2);
 
-                (this.$refs.contextMenu as VueType).$el.setAttribute('style', `left: ${positionElement}; top: ${e.clientY}`);
+                    (this.$refs.contextMenu as VueType).$el.setAttribute('style', `left: ${positionElement}px; top: ${e.layerY}px`);
+                });
             },
 
             /**
@@ -153,6 +157,14 @@
              */
             _clickListener: function (e: MouseEvent) {
                 if (e.button !== 2 && this.contextMenuVisible) {
+                    // If we're clicking the trigger icon don't discard the event.
+                    if (this.$refs.menuTriggerIcon) {
+                        if (e.target === this.$refs.menuTriggerIcon || (this.$refs.menuTriggerIcon as HTMLDivElement).contains(e.target as Node)) {
+                            return;
+                        }
+                    }
+
+                    // If the target is outside the scope of the context menu, hide it.
                     if (e.target !== (this.$refs.contextMenu as VueType).$el && !(this.$refs.contextMenu as VueType).$el.contains(e.target as Node)) {
                         this.contextMenuVisible = false;
                     }
diff --git a/resources/assets/scripts/components/server/subpages/FileManager.vue b/resources/assets/scripts/components/server/subpages/FileManager.vue
index f4258a149..42c2e7972 100644
--- a/resources/assets/scripts/components/server/subpages/FileManager.vue
+++ b/resources/assets/scripts/components/server/subpages/FileManager.vue
@@ -29,7 +29,7 @@
                     <div class="flex-1">Name</div>
                     <div class="flex-1 text-right">Size</div>
                     <div class="flex-1 text-right">Modified</div>
-                    <div class="flex-none w-1/6">Actions</div>
+                    <div class="flex-none"></div>
                 </div>
                 <div v-for="file in Array.concat(directories, files)">
                     <FileRow
diff --git a/resources/assets/styles/components/filemanager.css b/resources/assets/styles/components/filemanager.css
index c74b1fee1..329f90ea1 100644
--- a/resources/assets/styles/components/filemanager.css
+++ b/resources/assets/styles/components/filemanager.css
@@ -2,28 +2,25 @@
   & .header {
     @apply .flex .text-xs .text-neutral-600 .pb-4 .font-bold .border-b .border-neutral-200 .mb-3 .uppercase;
 
-    & > div {
+    & > div:not(:last-of-type) {
       @apply .pr-4;
     }
   }
 
   & .row {
-    @apply .flex .text-sm .py-3 .text-sm .border .border-transparent .text-black .rounded;
+    @apply .flex .text-sm .py-3 .text-sm .border .border-transparent .text-black .rounded .no-underline;
 
-    & > div {
+    & > div:not(:last-of-type) {
       @apply .pr-4;
     }
 
-    &.clickable {
-      @apply .no-underline .cursor-pointer;
-    }
-
-    &.active-selection, &.clickable:hover {
+    &.active-selection, &:hover {
       @apply .bg-neutral-50 .text-neutral-900;
     }
 
     & > .icon {
       @apply .w-8 .text-center;
+
       & > svg {
         @apply .h-4;
       }