diff --git a/CHANGES b/CHANGES
index 54416dc02..dabce4b9c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,7 @@ Other fixes:
  - mGUI: Fix cases where an older save state screenshot would be shown (fixes mgba.io/i/2183)
  - Qt: Re-enable sync for multiplayer windows that aren't connected (fixes mgba.io/i/2974)
  - Qt: Fix mute settings not being loaded on setting screen (fixes mgba.io/i/2990)
+ - Qt: Fix screen freezing on macOS after closing save state window (fixes mgba.io/i/2885)
  - Vita: Fix camera setting not appearing (fixes mgba.io/i/3012)
 Misc:
  - mGUI: Persist fast forwarding after closing menu (fixes mgba.io/i/2414)
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index be1433642..4a16c73bb 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -1910,8 +1910,15 @@ void Window::setupOptions() {
 }
 
 void Window::attachWidget(QWidget* widget) {
+	// Fix https://mgba.io/i/2885 -- seems like a Qt bug
+	if (m_display && widget != m_display.get()) {
+		m_display->hide();
+	}
 	takeCentralWidget();
 	setCentralWidget(widget);
+	if (m_display && widget == m_display.get()) {
+		m_display->show();
+	}
 }
 
 void Window::detachWidget() {