diff --git a/main/input_default.cpp b/main/input_default.cpp
index 401633e8b5d5..8a0635c5f44c 100644
--- a/main/input_default.cpp
+++ b/main/input_default.cpp
@@ -282,8 +282,9 @@ void InputDefault::joy_connection_changed(int p_idx, bool p_connected, String p_
 	};
 	joy_names[p_idx] = js;
 
-	emit_signal("joy_connection_changed", p_idx, p_connected);
-};
+	// Ensure this signal is emitted on the main thread, as some platforms (e.g. Linux) call this from a different thread.
+	call_deferred("emit_signal", "joy_connection_changed", p_idx, p_connected);
+}
 
 Vector3 InputDefault::get_gravity() const {
 	_THREAD_SAFE_METHOD_