diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index b1a0e6a36..a2c3b709d 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2514,6 +2514,7 @@ define([
             else if (e.which === 13) {
                 if ($container.find('.cp-icons-element-selected').length === 1) {
                     $container.find('.cp-icons-element-selected').click();
+                    return;
                 }
             }
         });
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 16576ca58..db2811fff 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1063,7 +1063,6 @@ define([
                             $elements.index($selection.last()[0]);
             var length = $elements.length;
             if (length === 0) { return; }
-
             // List mode
             if (getViewMode() === "list") {
                 if (e.which === 40) { click($elements.get(Math.min(lastIndex+1, length -1))); }