diff --git a/src/ui.c b/src/ui.c
index d8c8067..a350086 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -60,6 +60,12 @@ _system_stats_thread(void *data, Ecore_Thread *thread)
              if (ecore_thread_check(thread))
                return;
 
+             if (ui->skip_wait)
+               {
+                  ui->skip_wait = EINA_FALSE;
+                  break;
+               }
+
              usleep(500000);
           }
      }
@@ -455,6 +461,12 @@ _system_process_list(void *data, Ecore_Thread *thread)
              if (ecore_thread_check(thread))
                return;
 
+             if (ui->skip_wait)
+               {
+                  ui->skip_wait = EINA_FALSE;
+                  break;
+               }
+
              usleep(500000);
           }
      }
@@ -2168,14 +2180,17 @@ _evisum_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
     if ((ev->keyname[0] == 'K' || ev->keyname[0] == 'k') && !ev->keyname[1])
      {
         ui->data_unit = DATA_UNIT_KB;
+        ui->skip_wait = EINA_TRUE;
      }
    else if ((ev->keyname[0] == 'M' || ev->keyname[0] == 'm') && !ev->keyname[1])
      {
         ui->data_unit = DATA_UNIT_MB;
+        ui->skip_wait = EINA_TRUE;
      }
    else if ((ev->keyname[0] == 'G' || ev->keyname[0] == 'g') && !ev->keyname[1])
      {
         ui->data_unit = DATA_UNIT_GB;
+        ui->skip_wait = EINA_TRUE;
      }
    else if (!strcmp(ev->keyname, "Escape"))
      {
diff --git a/src/ui.h b/src/ui.h
index 694fb9a..fcca49e 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -117,6 +117,7 @@ typedef struct Ui
    Evas_Object  *list_pid;
 
    Eina_Bool     first_run;
+   Eina_Bool     skip_wait;
 
    int64_t       cpu_times[PID_MAX];
    int64_t       pid_cpu_time;