From bd653ac5a89b1a47b7182c73bc5464f835645f07 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 27 May 2021 09:11:43 +0100
Subject: [PATCH] fix edge cases around space panel auto collapsing/closing
 menu

---
 src/components/views/spaces/SpacePanel.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx
index aac1f609d5..eb63b21f0e 100644
--- a/src/components/views/spaces/SpacePanel.tsx
+++ b/src/components/views/spaces/SpacePanel.tsx
@@ -128,7 +128,9 @@ const SpacePanel = () => {
     const [isPanelCollapsed, setPanelCollapsed] = useState(true);
 
     useEffect(() => {
-        closeMenu();
+        if (!isPanelCollapsed && menuDisplayed) {
+            closeMenu();
+        }
     }, [isPanelCollapsed]); // eslint-disable-line react-hooks/exhaustive-deps
 
     const newClasses = classNames("mx_SpaceButton_new", {
@@ -239,8 +241,8 @@ const SpacePanel = () => {
                         className={newClasses}
                         tooltip={menuDisplayed ? _t("Cancel") : _t("Create a space")}
                         onClick={menuDisplayed ? closeMenu : () => {
-                            openMenu();
                             if (!isPanelCollapsed) setPanelCollapsed(true);
+                            openMenu();
                         }}
                         isNarrow={isPanelCollapsed}
                     />