diff --git a/www/drive/file.css b/www/drive/file.css
index e80d6f98a..9f41d3839 100644
--- a/www/drive/file.css
+++ b/www/drive/file.css
@@ -66,6 +66,7 @@ li {
 .contextMenu {
   display: none;
   position: absolute;
+  z-index: 50;
 }
 .contextMenu li {
   padding: 0;
@@ -247,6 +248,7 @@ span.fa-folder-open {
 }
 #content div.grid li input {
   width: 100%;
+  margin-top: 5px;
 }
 #content div.grid li .fa {
   display: block;
diff --git a/www/drive/file.less b/www/drive/file.less
index d5a7c1d73..cf874dad7 100644
--- a/www/drive/file.less
+++ b/www/drive/file.less
@@ -95,6 +95,7 @@ li {
 .contextMenu {
     display: none;
     position: absolute;
+    z-index: 50;
     li {
         padding: 0;
         font-size: 16px;
@@ -292,6 +293,7 @@ span {
             }
             input {
                 width: 100%;
+                margin-top: 5px;
             }
             .fa {
                 display: block;
diff --git a/www/drive/main.js b/www/drive/main.js
index 1b6dd4a79..4836fe51c 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1424,7 +1424,8 @@ define([
                     // Open the menu
                     $iframe.find('.contextMenu').css({
                         top: ($context.offset().top + 32) + 'px',
-                        right: '0px'
+                        right: '0px',
+                        left: ''
                     });
                     $li.contextmenu();
                 });