diff --git a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
index d612dfdfc..bd68211b4 100644
--- a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
+++ b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
@@ -145,7 +145,7 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser(
                 // Change current directory when directories are clicked
                 if ($scope.isDirectory(file)) {
                     element.addClass('directory');
-                    element.on('click', function changeDirectory() {
+                    element.on('dblclick', function changeDirectory() {
                         $scope.changeDirectory(file);
                     });
                 }
@@ -153,11 +153,17 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser(
                 // Initiate downloads when normal files are clicked
                 else if ($scope.isNormalFile(file)) {
                     element.addClass('normal-file');
-                    element.on('click', function downloadFile() {
+                    element.on('dblclick', function downloadFile() {
                         $scope.downloadFile(file);
                     });
                 }
 
+                // Mark file as focused upon click
+                element.on('click', function focusFile() {
+                    element.parent().children().removeClass('focused');
+                    element.addClass('focused');
+                });
+
                 return element;
 
             };
diff --git a/guacamole/src/main/webapp/app/client/styles/file-browser.css b/guacamole/src/main/webapp/app/client/styles/file-browser.css
index 73fce34ad..602f4069c 100644
--- a/guacamole/src/main/webapp/app/client/styles/file-browser.css
+++ b/guacamole/src/main/webapp/app/client/styles/file-browser.css
@@ -29,6 +29,12 @@
 
 .file-browser .list-item .caption {
     white-space: nowrap;
+    border: 1px solid transparent;
+}
+
+.file-browser .list-item.focused .caption {
+    border: 1px dotted rgba(0, 0, 0, 0.5);
+    background: rgba(204, 221, 170, 0.5);
 }
 
 /* Directory / file icons */
diff --git a/guacamole/src/main/webapp/app/client/templates/guacFileBrowser.html b/guacamole/src/main/webapp/app/client/templates/guacFileBrowser.html
index 196a18dcd..57b4967e1 100644
--- a/guacamole/src/main/webapp/app/client/templates/guacFileBrowser.html
+++ b/guacamole/src/main/webapp/app/client/templates/guacFileBrowser.html
@@ -23,7 +23,7 @@
 
     <!-- Parent directory -->
     <div class="list-item directory previous" ng-show="filesystem.currentDirectory.parent">
-        <div class="caption" ng-click="changeDirectory(filesystem.currentDirectory.parent)">
+        <div class="caption" ng-dblclick="changeDirectory(filesystem.currentDirectory.parent)">
             <div class="icon"></div>..
         </div>
     </div>