diff --git a/rpcs3/Emu/Io/MouseHandler.h b/rpcs3/Emu/Io/MouseHandler.h
index ebea3cc793..38d5d69a7f 100644
--- a/rpcs3/Emu/Io/MouseHandler.h
+++ b/rpcs3/Emu/Io/MouseHandler.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <list>
 #include "Utilities/mutex.h"
diff --git a/rpcs3/Emu/Io/Null/NullKeyboardHandler.h b/rpcs3/Emu/Io/Null/NullKeyboardHandler.h
index e26688e042..56200e4308 100644
--- a/rpcs3/Emu/Io/Null/NullKeyboardHandler.h
+++ b/rpcs3/Emu/Io/Null/NullKeyboardHandler.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "Emu/Io/KeyboardHandler.h"
 
@@ -10,7 +10,7 @@ public:
 		memset(&m_info, 0, sizeof(KbInfo));
 		m_info.max_connect = max_connect;
 		m_keyboards.clear();
-		for(u32 i=0; i<max_connect; i++)
+		for (u32 i = 0; i < max_connect; i++)
 		{
 			m_keyboards.emplace_back(Keyboard());
 		}
diff --git a/rpcs3/Emu/Io/Null/NullMouseHandler.h b/rpcs3/Emu/Io/Null/NullMouseHandler.h
index 4be6fb8445..ac05836318 100644
--- a/rpcs3/Emu/Io/Null/NullMouseHandler.h
+++ b/rpcs3/Emu/Io/Null/NullMouseHandler.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "Emu/Io/MouseHandler.h"
 
diff --git a/rpcs3/Emu/Io/Null/NullPadHandler.h b/rpcs3/Emu/Io/Null/NullPadHandler.h
index a1eef90ae8..13c47b431c 100644
--- a/rpcs3/Emu/Io/Null/NullPadHandler.h
+++ b/rpcs3/Emu/Io/Null/NullPadHandler.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "Emu/Io/PadHandler.h"
 
diff --git a/rpcs3/basic_keyboard_handler.cpp b/rpcs3/basic_keyboard_handler.cpp
index f2ef3b5286..def89417e3 100644
--- a/rpcs3/basic_keyboard_handler.cpp
+++ b/rpcs3/basic_keyboard_handler.cpp
@@ -79,7 +79,7 @@ void basic_keyboard_handler::keyPressEvent(QKeyEvent* keyEvent)
 		return;
 	}
 
-	if (keyEvent->isAutoRepeat() && !m_keyboards[0].m_key_repeat)
+	if (m_keyboards.empty() || (keyEvent->isAutoRepeat() && !m_keyboards[0].m_key_repeat))
 	{
 		keyEvent->ignore();
 		return;
@@ -100,7 +100,7 @@ void basic_keyboard_handler::keyReleaseEvent(QKeyEvent* keyEvent)
 		return;
 	}
 
-	if (keyEvent->isAutoRepeat() && !m_keyboards[0].m_key_repeat)
+	if (m_keyboards.empty() || (keyEvent->isAutoRepeat() && !m_keyboards[0].m_key_repeat))
 	{
 		keyEvent->ignore();
 		return;
@@ -153,6 +153,11 @@ s32 basic_keyboard_handler::getUnmodifiedKey(QKeyEvent* keyEvent)
 
 void basic_keyboard_handler::LoadSettings()
 {
+	if (m_keyboards.empty())
+	{
+		return;
+	}
+
 	// Meta Keys
 	//m_keyboards[0].m_buttons.emplace_back(Qt::Key_Control, CELL_KB_MKEY_L_CTRL);
 	m_keyboards[0].m_buttons.emplace_back(Qt::Key_Shift, CELL_KB_MKEY_L_SHIFT);
diff --git a/rpcs3/rpcs3qt/gs_frame.h b/rpcs3/rpcs3qt/gs_frame.h
index e7aa344c93..1e9ffbbb61 100644
--- a/rpcs3/rpcs3qt/gs_frame.h
+++ b/rpcs3/rpcs3qt/gs_frame.h
@@ -36,7 +36,7 @@ private:
 	std::shared_ptr<gui_settings> m_gui_settings;
 
 	u64 m_frames = 0;
-	// display status of last title update
+	// display status of last title update, needed for dynamic changes of the fps setting
 	bool m_show_fps_in_title = false;
 	QString m_windowTitle;
 	bool m_disable_mouse;