diff --git a/src/demod/DemodulatorThread.cpp b/src/demod/DemodulatorThread.cpp
index 5ce1f3d..2c1e9b4 100644
--- a/src/demod/DemodulatorThread.cpp
+++ b/src/demod/DemodulatorThread.cpp
@@ -24,7 +24,7 @@ void DemodulatorThread::threadMain() {
 #ifdef __APPLE__
     pthread_t tID = pthread_self();  // ID of this thread
     int priority = sched_get_priority_max( SCHED_FIFO )-1;
-    sched_param prio = { priority }; // scheduling priority of thread
+    sched_param prio = {priority}; // scheduling priority of thread
     pthread_setschedparam(tID, SCHED_FIFO, &prio);
 #endif
 
@@ -94,10 +94,13 @@ void DemodulatorThread::threadMain() {
         }
 
         if (visOutQueue != NULL && visOutQueue->empty()) {
-            AudioThreadInput ati_vis;
-            ati_vis.data.assign(demod_output,demod_output+num_written);
-            visOutQueue->push(ati_vis);
-//            visOutQueue->push(ati);
+            if (num_audio_written > num_written) {
+                visOutQueue->push(ati);
+            } else {
+                AudioThreadInput ati_vis;
+                ati_vis.data.assign(demod_output, demod_output + num_written);
+                visOutQueue->push(ati_vis);
+            }
         }
     }
 
diff --git a/src/visual/WaterfallCanvas.cpp b/src/visual/WaterfallCanvas.cpp
index ed6cd80..d493029 100644
--- a/src/visual/WaterfallCanvas.cpp
+++ b/src/visual/WaterfallCanvas.cpp
@@ -77,13 +77,15 @@ void WaterfallCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
     DemodulatorInstance *activeDemodulator = wxGetApp().getDemodMgr().getActiveDemodulator();
     DemodulatorInstance *lastActiveDemodulator = wxGetApp().getDemodMgr().getLastActiveDemodulator();
 
+    bool isNew = shiftDown || (wxGetApp().getDemodMgr().getLastActiveDemodulator() && !wxGetApp().getDemodMgr().getLastActiveDemodulator()->isActive());
+
     if (mTracker.mouseInView()) {
         if (nextDragState == WF_DRAG_RANGE) {
             if (mTracker.mouseDown()) {
                 float width = mTracker.getOriginDeltaMouseX();
                 float centerPos = mTracker.getOriginMouseX() + width / 2.0;
 
-                if (shiftDown) {
+                if (isNew) {
                     glContext->DrawDemod(lastActiveDemodulator);
                     glContext->DrawFreqSelector(centerPos, 0, 1, 0, width ? width : (1.0 / (float) ClientSize.x));
                 } else {
@@ -91,7 +93,7 @@ void WaterfallCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
                     glContext->DrawFreqSelector(centerPos, 1, 1, 0, width ? width : (1.0 / (float) ClientSize.x));
                 }
             } else {
-                if (shiftDown) {
+                if (isNew) {
                     glContext->DrawDemod(lastActiveDemodulator);
                     glContext->DrawFreqSelector(mTracker.getMouseX(), 0, 1, 0, 1.0 / (float) ClientSize.x);
                 } else {
@@ -102,7 +104,7 @@ void WaterfallCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
         } else {
             if (activeDemodulator == NULL) {
                 if (lastActiveDemodulator) {
-                    if (shiftDown) {
+                    if (isNew) {
                         glContext->DrawDemod(lastActiveDemodulator);
                         glContext->DrawFreqSelector(mTracker.getMouseX(), 0, 1, 0);
                     } else {
@@ -420,6 +422,8 @@ void WaterfallCanvas::mouseReleased(wxMouseEvent& event) {
     altDown = event.AltDown();
     ctrlDown = event.ControlDown();
 
+    bool isNew = shiftDown || (wxGetApp().getDemodMgr().getLastActiveDemodulator() && !wxGetApp().getDemodMgr().getLastActiveDemodulator()->isActive());
+
     mTracker.setVertDragLock(false);
     mTracker.setHorizDragLock(false);
 
@@ -431,7 +435,7 @@ void WaterfallCanvas::mouseReleased(wxMouseEvent& event) {
         int freq = center_freq - (int) (0.5 * (float) SRATE) + (int) ((float) pos * (float) SRATE);
 
         if (dragState == WF_DRAG_NONE) {
-            if (!shiftDown && wxGetApp().getDemodMgr().getDemodulators().size()) {
+            if (!isNew && wxGetApp().getDemodMgr().getDemodulators().size()) {
                 demod = wxGetApp().getDemodMgr().getLastActiveDemodulator();
             } else {
                 demod = wxGetApp().getDemodMgr().newThread();
@@ -493,7 +497,7 @@ void WaterfallCanvas::mouseReleased(wxMouseEvent& event) {
             return;
         }
 
-        if (!shiftDown && wxGetApp().getDemodMgr().getDemodulators().size()) {
+        if (!isNew && wxGetApp().getDemodMgr().getDemodulators().size()) {
             demod = wxGetApp().getDemodMgr().getLastActiveDemodulator();
         } else {
             demod = wxGetApp().getDemodMgr().newThread();