diff --git a/CHANGES b/CHANGES
index c7440ebcf..bd95c05a6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -59,6 +59,7 @@ Other fixes:
  - Qt: Fix a race condition in the frame inspector
  - Qt: Load/save bytes from memory viewer in the order visible (fixes mgba.io/i/1900)
  - Qt: Fix running proxied video if it gets pushed to the main thread
+ - Qt: Fix game display sometimes disappearing after closing load/save state screen
  - SM83: Simplify register pair access on big endian
  - SM83: Disassemble STOP as one byte
 Misc:
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index b52c8ac79..efa7df30e 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -1071,6 +1071,7 @@ void Window::openStateWindow(LoadSave ls) {
 	connect(this, &Window::shutdown, m_stateWindow, &QWidget::close);
 	connect(m_stateWindow, &LoadSaveState::closed, [this]() {
 		detachWidget(m_stateWindow);
+		static_cast<QStackedLayout*>(m_screenWidget->layout())->setCurrentWidget(m_display.get());
 		m_stateWindow = nullptr;
 		QMetaObject::invokeMethod(this, "setFocus", Qt::QueuedConnection);
 	});