diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
index 5c80d52da..a0410b8e5 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@@ -2701,9 +2701,11 @@ void OBSBasic::on_actionRemux_triggered()
 
 void OBSBasic::on_action_Settings_triggered()
 {
+	disableHiding = true;
 	OBSBasicSettings settings(this);
 	settings.exec();
 	SystemTray(false);
+	disableHiding = false;
 }
 
 void OBSBasic::on_actionAdvAudioProperties_triggered()
@@ -3950,9 +3952,7 @@ void OBSBasic::on_recordButton_clicked()
 
 void OBSBasic::on_settingsButton_clicked()
 {
-	OBSBasicSettings settings(this);
-	settings.exec();
-	SystemTray(false);
+	on_action_Settings_triggered();
 }
 
 void OBSBasic::on_actionWebsite_triggered()
diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp
index 792742d62..04453fecf 100644
--- a/UI/window-basic-main.hpp
+++ b/UI/window-basic-main.hpp
@@ -150,6 +150,7 @@ private:
 	QAction       *showHide;
 	QAction       *showPreview;
 	QAction       *exit;
+	bool          disableHiding = false;
 
 	void          DrawBackdrop(float cx, float cy);
 
@@ -362,7 +363,10 @@ private slots:
 
 	inline void ToggleShowHide()
 	{
-		SetShowing(!isVisible());
+		bool showing = isVisible();
+		if (disableHiding && showing)
+			return;
+		SetShowing(!showing);
 	}
 
 private: