diff --git a/global.h b/global.h
index dcd08ea..0e73a6d 100644
--- a/global.h
+++ b/global.h
@@ -31,7 +31,7 @@
 
 
 #define PROGRAM_NAME          "DSRemote"
-#define PROGRAM_VERSION       "0.20_1506281129"
+#define PROGRAM_VERSION       "0.20_1507041109"
 
 #define MAX_PATHLEN            4096
 
diff --git a/interface.cpp b/interface.cpp
index 6d449b3..a8a3e3a 100644
--- a/interface.cpp
+++ b/interface.cpp
@@ -2071,6 +2071,8 @@ void UI_Mainwindow::clearButtonClicked()
   statusLabel->setText("Display cleared");
 
   tmc_write(":DISP:CLE");
+
+  waveForm->clear();
 }
 
 
diff --git a/timer_handlers.cpp b/timer_handlers.cpp
index 7d6c5d1..0ee8695 100644
--- a/timer_handlers.cpp
+++ b/timer_handlers.cpp
@@ -408,11 +408,15 @@ void UI_Mainwindow::scrn_timer_handler()
         devparms.wavebuf[i][j] = (int)(((unsigned char *)device->buf)[j]) - 127;
       }
     }
+
+    devparms.wavebufsz = n;
+
+    waveForm->drawCurve(&devparms, device, n);
+  }
+  else  // triggerstatus is "wait"
+  {
+    waveForm->update();
   }
-
-  devparms.wavebufsz = n;
-
-  waveForm->drawCurve(&devparms, device, n);
 
   return;