diff --git a/include/emulator.hpp b/include/emulator.hpp
index df930373..2da76847 100644
--- a/include/emulator.hpp
+++ b/include/emulator.hpp
@@ -52,12 +52,14 @@ class Emulator {
 	// We bind gyro to right click + mouse movement
 	bool holdingRightClick = false;
 
+  public:
 	static constexpr u32 width = 400;
 	static constexpr u32 height = 240 * 2;  // * 2 because 2 screens
 	ROMType romType = ROMType::None;
 	bool running = false;         // Is the emulator running a game?
 	bool programRunning = false;  // Is the emulator program itself running?
 
+  private:
 #ifdef PANDA3DS_ENABLE_HTTP_SERVER
 	HttpServer httpServer;
 	friend struct HttpServer;
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index ab717087..adfd3470 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -91,6 +91,10 @@ void MainWindow::emuThreadMainLoop() {
 		}
 
 		emu->runFrame();
+		if (emu->romType != ROMType::None) {
+			emu->getServiceManager().getHID().updateInputs(emu->getTicks());
+		}
+
 		swapEmuBuffer();
 	}