diff --git a/CHANGES b/CHANGES
index 4ff6071e7..8b15b5f8e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@ Other fixes:
  - Core: Fix thread unsafety issue when dispatching code to a thread
  - Debugger: Close trace log when done tracing
  - 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
  - Wii: Fix crash on unloading irregularly sized GBA ROMs
 
 0.8.4: (2020-10-29)
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index 6ac17c363..83a897b70 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -1058,6 +1058,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);
 	});