diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index 6d8105366..27e5e4f63 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -866,7 +866,8 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl
             event.preventDefault();
             $scope.$apply($scope.actionSelectAll);
         } else if(event.key === 'Escape') {
-            $scope.$apply(function () { $scope.selected = []; });
+            if ($scope.textEditor.visible) return $scope.textEditor.maybeClose();
+            else $scope.$apply(function () { $scope.selected = []; });
         }
     });