diff --git a/module/doc/js/app.ui.js b/module/doc/js/app.ui.js
index 779646086d..1f79a0f3eb 100644
--- a/module/doc/js/app.ui.js
+++ b/module/doc/js/app.ui.js
@@ -656,7 +656,17 @@ const commands =
             {
                 if(res && res.result === 'success')
                 {
-                    getDocApp().delete('space', spaceID);
+                    const docApp = getDocApp();
+                    if(spaceID === docApp.spaceID && docApp.mode !== 'home')
+                    {
+                        const spaceList = docApp.spaceList;
+                        if(spaceList.length)
+                        {
+                            docApp.selectSpace(spaceList[0].id);
+                            return;
+                        }
+                    }
+                    docApp.delete('space', spaceID);
                 }
             }
         });