diff --git a/src/kernel/start.c b/src/kernel/start.c
index 7c8cdf1..26e4257 100644
--- a/src/kernel/start.c
+++ b/src/kernel/start.c
@@ -42,7 +42,8 @@ int8_t gint_restart = 0;
 /* gint_setrestart(): Set whether to restart the add-in after exiting */
 void gint_setrestart(int restart)
 {
-	gint_restart = !!restart;
+	/* There is now return-to-menu so no restart on CP */
+	gint_restart = restart && !GINT_OS_CP;
 }
 
 /* Return value of main() */