diff --git a/main.c b/main.c
index d25d6d4..96bb080 100644
--- a/main.c
+++ b/main.c
@@ -166,7 +166,8 @@ static THD_FUNCTION(Thread1, arg)
       continue;
     }
     // Process UI inputs
-    ui_process();
+    if (!(sweep_mode & SWEEP_SELFTEST))
+      ui_process();
     // Process collected data, calculate trace coordinates and plot only if scan
     // completed
     if (/* sweep_mode & SWEEP_ENABLE && */ completed) {
diff --git a/sa_core.c b/sa_core.c
index 09dcb4b..31b15ec 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -2551,7 +2551,7 @@ void self_test(int test)
 {
   if (test == 0) {
     if (test_wait ) {
-      if (test_case[test_step].kind == TC_END)
+      if (test_case[test_step].kind == TC_END || setting.test_argument != 0)
         goto resume2;
       else
         goto resume;