diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp
index befa0f6ca4..cd3be9999f 100644
--- a/Source/Core/DolphinQt2/MainWindow.cpp
+++ b/Source/Core/DolphinQt2/MainWindow.cpp
@@ -209,6 +209,12 @@ void MainWindow::InitCoreCallbacks()
   connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, [=](Core::State state) {
     if (state == Core::State::Uninitialized)
       OnStopComplete();
+
+    if (state == Core::State::Running && m_fullscreen_requested)
+    {
+      FullScreen();
+      m_fullscreen_requested = false;
+    }
   });
   installEventFilter(this);
   m_render_widget->installEventFilter(this);
@@ -476,6 +482,10 @@ void MainWindow::ConnectRenderWidget()
   m_rendering_to_main = false;
   m_render_widget->hide();
   connect(m_render_widget, &RenderWidget::Closed, this, &MainWindow::ForceStop);
+  connect(m_render_widget, &RenderWidget::FocusChanged, this, [this](bool focus) {
+    if (m_render_widget->isFullScreen())
+      SetFullScreenResolution(focus);
+  });
 }
 
 void MainWindow::ConnectHost()
@@ -771,8 +781,12 @@ void MainWindow::StartGame(std::unique_ptr<BootParameters>&& parameters)
     QMessageBox::critical(this, tr("Error"), tr("Failed to init core"), QMessageBox::Ok);
     return;
   }
+
   ShowRenderWidget();
 
+  if (SConfig::GetInstance().bFullscreen)
+    m_fullscreen_requested = true;
+
 #ifdef Q_OS_WIN
   // Prevents Windows from sleeping, turning off the display, or idling
   EXECUTION_STATE shouldScreenSave =
@@ -810,13 +824,6 @@ void MainWindow::SetFullScreenResolution(bool fullscreen)
 
 void MainWindow::ShowRenderWidget()
 {
-  if (SConfig::GetInstance().bFullscreen && !m_render_widget->isFullScreen())
-  {
-    m_render_widget->showFullScreen();
-    SetFullScreenResolution(true);
-    return;
-  }
-
   SetFullScreenResolution(false);
   Host::GetInstance()->SetRenderFullscreen(false);
 
@@ -871,6 +878,10 @@ void MainWindow::HideRenderWidget(bool reinit)
 
     m_render_widget->installEventFilter(this);
     connect(m_render_widget, &RenderWidget::Closed, this, &MainWindow::ForceStop);
+    connect(m_render_widget, &RenderWidget::FocusChanged, this, [this](bool focus) {
+      if (m_render_widget->isFullScreen())
+        SetFullScreenResolution(focus);
+    });
   }
 }
 
diff --git a/Source/Core/DolphinQt2/MainWindow.h b/Source/Core/DolphinQt2/MainWindow.h
index 7bf2f3fd80..3f922672ed 100644
--- a/Source/Core/DolphinQt2/MainWindow.h
+++ b/Source/Core/DolphinQt2/MainWindow.h
@@ -175,6 +175,7 @@ private:
   bool m_rendering_to_main;
   bool m_stop_requested = false;
   bool m_exit_requested = false;
+  bool m_fullscreen_requested = false;
   int m_state_slot = 1;
   std::unique_ptr<BootParameters> m_pending_boot;
 
diff --git a/Source/Core/DolphinQt2/RenderWidget.cpp b/Source/Core/DolphinQt2/RenderWidget.cpp
index 0d8e1a9660..8d61e05b23 100644
--- a/Source/Core/DolphinQt2/RenderWidget.cpp
+++ b/Source/Core/DolphinQt2/RenderWidget.cpp
@@ -52,6 +52,8 @@ RenderWidget::RenderWidget(QWidget* parent) : QWidget(parent)
           Qt::DirectConnection);
   connect(this, &RenderWidget::SizeChanged, Host::GetInstance(), &Host::ResizeSurface,
           Qt::DirectConnection);
+  connect(this, &RenderWidget::FocusChanged, Host::GetInstance(), &Host::SetRenderFocus,
+          Qt::DirectConnection);
 
   emit HandleChanged((void*)winId());
 
@@ -145,14 +147,16 @@ bool RenderWidget::event(QEvent* event)
     emit HandleChanged((void*)winId());
     break;
   case QEvent::WindowActivate:
-    Host::GetInstance()->SetRenderFocus(true);
     if (SConfig::GetInstance().m_PauseOnFocusLost && Core::GetState() == Core::State::Paused)
       Core::SetState(Core::State::Running);
+
+    emit FocusChanged(true);
     break;
   case QEvent::WindowDeactivate:
-    Host::GetInstance()->SetRenderFocus(false);
     if (SConfig::GetInstance().m_PauseOnFocusLost && Core::GetState() == Core::State::Running)
       Core::SetState(Core::State::Paused);
+
+    emit FocusChanged(false);
     break;
   case QEvent::Resize:
   {
diff --git a/Source/Core/DolphinQt2/RenderWidget.h b/Source/Core/DolphinQt2/RenderWidget.h
index 6122fc8633..ef7762ae1d 100644
--- a/Source/Core/DolphinQt2/RenderWidget.h
+++ b/Source/Core/DolphinQt2/RenderWidget.h
@@ -28,6 +28,7 @@ signals:
   void HandleChanged(void* handle);
   void StateChanged(bool fullscreen);
   void SizeChanged(int new_width, int new_height);
+  void FocusChanged(bool focus);
 
 private:
   void HandleCursorTimer();