diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx
index 411b0f9b5e..163a5cfb0b 100644
--- a/src/components/views/spaces/SpacePanel.tsx
+++ b/src/components/views/spaces/SpacePanel.tsx
@@ -221,14 +221,20 @@ const SpacePanel = () => {
                             space={s}
                             activeSpaces={activeSpaces}
                             isPanelCollapsed={isPanelCollapsed}
-                            onExpand={() => setPanelCollapsed(false)}
+                            onExpand={() => {
+                                closeMenu();
+                                setPanelCollapsed(false);
+                            }}
                         />) }
                         { spaces.map(s => <SpaceItem
                             key={s.roomId}
                             space={s}
                             activeSpaces={activeSpaces}
                             isPanelCollapsed={isPanelCollapsed}
-                            onExpand={() => setPanelCollapsed(false)}
+                            onExpand={() => {
+                                closeMenu();
+                                setPanelCollapsed(false);
+                            }}
                         />) }
                     </div>
                     <SpaceButton