diff --git a/android-qemu2-glue/qemu-setup.cpp b/android-qemu2-glue/qemu-setup.cpp
index 34ac0ca..f0b2268 100644
--- a/android-qemu2-glue/qemu-setup.cpp
+++ b/android-qemu2-glue/qemu-setup.cpp
@@ -17,6 +17,7 @@
 #include "android/android.h"
 #include "android/base/Log.h"
 #include "android/console.h"
+#include "android/skin/winsys.h"
 #include "android-qemu2-glue/emulation/android_pipe_device.h"
 #include "android-qemu2-glue/emulation/charpipe.h"
 #include "android-qemu2-glue/emulation/goldfish_sync.h"
@@ -46,6 +47,9 @@
     qemu_looper_setForThread();
     qemu_thread_register_setup_callback(qemu_looper_setForThread);
 
+    // Make sure we override the ctrl-C handler as soon as possible.
+    qemu_set_ctrlc_handler(&skin_winsys_quit_request);
+
     // Ensure charpipes i/o are handled properly.
     main_loop_register_poll_callback(qemu_charpipe_poll);