diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less
index 07c9ff3a7..72e34d7c6 100644
--- a/customize.dist/src/less2/include/drive.less
+++ b/customize.dist/src/less2/include/drive.less
@@ -781,6 +781,7 @@
                 flex-grow: 1;
                 justify-content: flex-end;
                 .cp-app-drive-path-element {
+                    .tools_unselectable();
                     display: inline-block;
                     flex-shrink: 0;
                     max-width: 100%;
@@ -795,7 +796,6 @@
                     overflow: hidden;
                     text-overflow: ellipsis;
                     transition: all 0.15s;
-                    cursor: pointer;
 
                     &:first-child {
                         flex-shrink: 1;
@@ -813,12 +813,15 @@
                     &.cp-app-drive-element-droppable {
                         background-color: @drive_droppable-bg;
                     }
-                    &:not(.cp-app-drive-element-droppable):hover {
-                        &:not(.cp-app-drive-path-separator) {
-                            text-decoration: underline;
-                        }
-                        & ~ .cp-app-drive-path-element:not(.cp-app-drive-path-separator) {
-                            text-decoration: underline;
+                    &.cp-app-drive-path-clickable {
+                        cursor: pointer;
+                        &:hover {
+                            &:not(.cp-app-drive-path-separator) {
+                                text-decoration: underline;
+                            }
+                            & ~ .cp-app-drive-path-element:not(.cp-app-drive-path-separator) {
+                                text-decoration: underline;
+                            }
                         }
                     }
                 }
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 237db86a3..240e2f5b0 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3584,9 +3584,7 @@ define([
 
             createToolbar(path);
 
-            if (inTrash || isInRoot) {
-                createTitle($content, path);
-            }
+            if (!isSearch) { createTitle($content, path); }
             var $info = createInfoBox(path);
 
             var $dirContent = $('<div>', {id: FOLDER_CONTENT_ID});