diff --git a/www/drive/file.css b/www/drive/file.css
index 6f22515cc..7a74c6a17 100644
--- a/www/drive/file.css
+++ b/www/drive/file.css
@@ -122,14 +122,14 @@ span.fa-folder-open {
   margin-left: -5px;
   padding-left: 5px;
 }
-#tree li > span.element-row:not(.selected):hover {
+#tree li > span.element-row:not(.selected):not(.active):hover {
   background-color: #eee;
 }
 #tree span.element {
   cursor: pointer;
 }
-#tree .active {
-  text-decoration: underline;
+#tree .active:not(.selected) {
+  background-color: #c8c8c8;
 }
 #tree .category2 {
   margin-top: 2em;
diff --git a/www/drive/file.less b/www/drive/file.less
index f30289cc0..1dd828fcb 100644
--- a/www/drive/file.less
+++ b/www/drive/file.less
@@ -156,7 +156,7 @@ span {
             margin-left: -5px;
             padding-left: 5px;
         }
-        & > span.element-row:not(.selected):hover {
+        & > span.element-row:not(.selected):not(.active):hover {
             background-color: @drive-hover;
         }
     }
@@ -164,7 +164,9 @@ span {
         cursor: pointer;
     }
     .active {
-        text-decoration: underline;
+        &:not(.selected) {
+            background-color: darken(@drive-hover, 15%);
+        }
     }
     .category2 {
         margin-top: 2em;
diff --git a/www/drive/main.js b/www/drive/main.js
index a06ca36ec..238a0cdea 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -438,7 +438,7 @@ define([
         var updateContextButton = function () {
             var $li = $content.find('.selected');
             if ($li.length === 0) {
-                $li = findDataHolder($tree.find('.element.active'));
+                $li = findDataHolder($tree.find('.active'));
             }
             var $button = $driveToolbar.find('#contextButton');
             if ($button.length) { // mobile
@@ -1538,7 +1538,7 @@ define([
                     e.stopPropagation();
                     var $li = $content.find('.selected');
                     if ($li.length !== 1) {
-                        $li = findDataHolder($tree.find('.element.active'));
+                        $li = findDataHolder($tree.find('.active'));
                     }
                     // Close if already opened
                     if ($iframe.find('.contextMenu:visible').length) {
@@ -1657,7 +1657,7 @@ define([
             }
             $elementRow.data('path', path);
             addDragAndDropHandlers($elementRow, path, true, droppable);
-            if (active) { $name.addClass('active'); }
+            if (active) { $elementRow.addClass('active'); }
             return $element;
         };