diff --git a/bin/GuiConfigs/YoRHa by Ani.qss b/bin/GuiConfigs/YoRHa by Ani.qss
index 7dfe572aa7..bfe32c9510 100644
--- a/bin/GuiConfigs/YoRHa by Ani.qss	
+++ b/bin/GuiConfigs/YoRHa by Ani.qss	
@@ -57,7 +57,7 @@ QWidget#cg_disasm {
 
 
 /* Main Window, Dialogs and Trophy Manager which isn't a dialog */
-QDialog, QWidget#trophy_manager, QMainWindow#main_window  {
+QDialog, QWidget#trophy_manager, QMainWindow#main_window {
 	border-image: url("GuiConfigs/YoRHa-background.jpg");
 }
 
@@ -225,6 +225,9 @@ QDockWidget {
 	color: #b3ac98;
 	font-weight: 500;
 }
+[floating="true"] {
+	background: #b3ac98;
+}
 QDockWidget::title {
 	background: #4d4940;
 	padding-top: 0.2em;
diff --git a/rpcs3/rpcs3qt/debugger_frame.h b/rpcs3/rpcs3qt/debugger_frame.h
index 44251fc264..14e6295b5b 100644
--- a/rpcs3/rpcs3qt/debugger_frame.h
+++ b/rpcs3/rpcs3qt/debugger_frame.h
@@ -86,9 +86,9 @@ public:
 
 protected:
 	/** Override inherited method from Qt to allow signalling when close happened.*/
-	void closeEvent(QCloseEvent* event);
-	void showEvent(QShowEvent* event);
-	void hideEvent(QHideEvent* event);
+	void closeEvent(QCloseEvent* event) override;
+	void showEvent(QShowEvent* event) override;
+	void hideEvent(QHideEvent* event) override;
 
 Q_SIGNALS:
 	void DebugFrameClosed();
diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp
index ed25e28a7d..e6650ec3a0 100644
--- a/rpcs3/rpcs3qt/main_window.cpp
+++ b/rpcs3/rpcs3qt/main_window.cpp
@@ -1328,6 +1328,11 @@ void main_window::CreateDockWindows()
 			guiSettings->SetValue(gui::mw_logger, false);
 		}
 	});
+	connect(m_logFrame, &log_frame::topLevelChanged, [=](bool/* topLevel*/)
+	{
+		m_logFrame->style()->unpolish(m_logFrame);
+		m_logFrame->style()->polish(m_logFrame);
+	});
 
 	connect(m_debuggerFrame, &debugger_frame::DebugFrameClosed, [=]()
 	{
@@ -1337,6 +1342,11 @@ void main_window::CreateDockWindows()
 			guiSettings->SetValue(gui::mw_debugger, false);
 		}
 	});
+	connect(m_debuggerFrame, &log_frame::topLevelChanged, [=](bool/* topLevel*/)
+	{
+		m_debuggerFrame->style()->unpolish(m_debuggerFrame);
+		m_debuggerFrame->style()->polish(m_debuggerFrame);
+	});
 
 	connect(m_gameListFrame, &game_list_frame::GameListFrameClosed, [=]()
 	{
@@ -1346,6 +1356,11 @@ void main_window::CreateDockWindows()
 			guiSettings->SetValue(gui::mw_gamelist, false);
 		}
 	});
+	connect(m_gameListFrame, &log_frame::topLevelChanged, [=](bool/* topLevel*/)
+	{
+		m_gameListFrame->style()->unpolish(m_gameListFrame);
+		m_gameListFrame->style()->polish(m_gameListFrame);
+	});
 
 	connect(m_gameListFrame, &game_list_frame::RequestBoot, [this](const std::string& path){ Boot(path); });
 }