diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
--- a/containments/desktop/package/contents/ui/FolderView.qml
+++ b/containments/desktop/package/contents/ui/FolderView.qml
@@ -841,10 +841,7 @@
                     gridView.cachedRectangleSelection = indices;
                 }
 
-                Behavior on contentX { id: smoothX; enabled: false; SmoothedAnimation { velocity: 700 } }
-                Behavior on contentY { id: smoothY; enabled: false; SmoothedAnimation { velocity: 700 } }
-
-                Keys.onReturnPressed: {
+                function runOrCdSelected() {
                     if (currentIndex != -1 && dir.hasSelection()) {
                         if (root.useListViewMode && currentItem.isDir) {
                             doCd(positioner.map(currentIndex));
@@ -854,6 +851,12 @@
                     }
                 }
 
+                Behavior on contentX { id: smoothX; enabled: false; SmoothedAnimation { velocity: 700 } }
+                Behavior on contentY { id: smoothY; enabled: false; SmoothedAnimation { velocity: 700 } }
+
+                Keys.onReturnPressed: runOrCdSelected()
+                Keys.onEnterPressed: runOrCdSelected()
+
                 Keys.onMenuPressed: {
                     if (currentIndex != -1 && dir.hasSelection() && currentItem) {
                         dir.setSelected(positioner.map(currentIndex));