diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp
index ab5b567..599384a 100644
--- a/src/AppFrame.cpp
+++ b/src/AppFrame.cpp
@@ -181,6 +181,8 @@ AppFrame::AppFrame() :
     demodVisuals->Add(demodWaterfallCanvas, 6, wxEXPAND | wxALL, 0);
     wxGetApp().getDemodSpectrumProcessor()->attachOutput(demodWaterfallCanvas->getVisualDataQueue());
     demodWaterfallCanvas->getVisualDataQueue()->set_max_num_items(3);
+    demodWaterfallCanvas->setLinesPerSecond((int)(DEFAULT_DEMOD_WATERFALL_LINES_NB / DEMOD_WATERFALL_DURATION_IN_SECONDS));
+
 
     demodVisuals->SetMinSize(wxSize(128,-1));
 
diff --git a/src/CubicSDRDefs.h b/src/CubicSDRDefs.h
index 17387eb..1c22251 100644
--- a/src/CubicSDRDefs.h
+++ b/src/CubicSDRDefs.h
@@ -38,14 +38,19 @@ const char filePathSeparator =
 #define DEFAULT_SCOPE_FFT_SIZE (DEFAULT_FFT_SIZE / 2)
 
 //Both must be a power of 2 to prevent terrible OpenGL performance.
-#define DEFAULT_MAIN_WATERFALL_LINES_NB 512
-#define DEFAULT_DEMOD_WATERFALL_LINES_NB 128
+#define DEFAULT_MAIN_WATERFALL_LINES_NB 1024
+#define DEFAULT_DEMOD_WATERFALL_LINES_NB 256
 
 #define DEFAULT_DEMOD_TYPE "FM"
 #define DEFAULT_DEMOD_BW 200000
 
 #define DEFAULT_WATERFALL_LPS 30
 
+//Dmod waterfall lines per second is adjusted 
+//so that the whole demod waterfall show DEMOD_WATERFALL_DURATION_IN_SECONDS
+//seconds.
+#define DEMOD_WATERFALL_DURATION_IN_SECONDS 4.0
+
 #define CHANNELIZER_RATE_MAX 500000
 
 #define MANUAL_SAMPLE_RATE_MIN 2000000 // 2MHz
diff --git a/src/visual/WaterfallCanvas.cpp b/src/visual/WaterfallCanvas.cpp
index 811c7c0..b75ca92 100644
--- a/src/visual/WaterfallCanvas.cpp
+++ b/src/visual/WaterfallCanvas.cpp
@@ -42,7 +42,7 @@ WaterfallCanvas::WaterfallCanvas(wxWindow *parent, std::vector<int> dispAttrs) :
         dragOfs(0), mouseZoom(1), zoom(1), freqMoving(false), freqMove(0.0), hoverAlpha(1.0) {
 
     glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
-    linesPerSecond = 30;
+    linesPerSecond = DEFAULT_WATERFALL_LPS;
     lpsIndex = 0;
     preBuf = false;
     SetCursor(wxCURSOR_CROSS);