diff --git a/src/filemanager.html b/src/filemanager.html
index f273bb6e9..cfbdad34c 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -272,7 +272,7 @@
           <p class="text-bold text-danger">{{ 'filemanager.textEditorCloseDialog.details' | tr }}</p>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-default" ng-click="textEditor.close()">{{ 'filemanager.textEditorCloseDialog.dontSave' | tr }}</button>
+          <button type="button" class="btn btn-default" ng-click="textEditor.onClose()">{{ 'filemanager.textEditorCloseDialog.dontSave' | tr }}</button>
           <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
           <button type="button" class="btn btn-success" ng-click="textEditor.saveAndClose()"><i class="fa fa-circle-notch fa-spin" ng-show="textEditor.busy"></i> {{ 'main.dialog.save' | tr }}</button>
         </div>
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index 6ab97addd..3226f87a5 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -858,14 +858,20 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl
             $('#textEditorCloseModal').modal('hide');
         },
 
+        onClose: function () {
+            $scope.view = 'fileTree';
+            location.hash = $scope.cwd;
+            $('#textEditorCloseModal').modal('hide');
+        },
+
         saveAndClose: function () {
             $scope.textEditor.save(function () {
-                $scope.textEditor.close();
+                $scope.textEditor.onClose();
             });
         },
 
         maybeClose: function () {
-            if (!$scope.textEditor.unsaved) return $scope.textEditor.close();
+            if (!$scope.textEditor.unsaved) return $scope.textEditor.onClose();
             $('#textEditorCloseModal').modal('show');
         },
     };