diff --git a/Widgets/SidePanel/PanelPopup.qml b/Widgets/SidePanel/PanelPopup.qml
index d62d31be..1a699568 100644
--- a/Widgets/SidePanel/PanelPopup.qml
+++ b/Widgets/SidePanel/PanelPopup.qml
@@ -301,8 +301,10 @@ PanelWithOverlay {
                                     onClicked: {
                                         if (sidebarPopupRect.isRecording) {
                                             sidebarPopupRect.stopRecording();
+                                            sidebarPopup.dismiss();
                                         } else {
                                             sidebarPopupRect.startRecording();
+                                            sidebarPopup.dismiss();
                                         }
                                     }
                                 }
@@ -343,8 +345,10 @@ PanelWithOverlay {
                                     hoverEnabled: true
                                     cursorShape: Qt.PointingHandCursor
                                     onClicked: {
-                                        if (typeof settingsModal !== 'undefined' && settingsModal && settingsModal.openSettings)
+                                        if (typeof settingsModal !== 'undefined' && settingsModal && settingsModal.openSettings) {
                                             settingsModal.openSettings(6);
+                                            sidebarPopup.dismiss();
+                                        }
                                     }
                                 }
 
diff --git a/Widgets/SidePanel/SettingsIcon.qml b/Widgets/SidePanel/SettingsIcon.qml
index 866db59b..dc12ac2b 100644
--- a/Widgets/SidePanel/SettingsIcon.qml
+++ b/Widgets/SidePanel/SettingsIcon.qml
@@ -57,6 +57,7 @@ PanelWindow {
                     }
                 });
             }
+            sidebarPopup.dismiss();
         } else if (settingsWindow.visible) {
             // Close and destroy window
             var windowToDestroy = settingsWindow;