diff --git a/ApplicationCode/UserInterface/RiuTimeHistoryQwtPlot.cpp b/ApplicationCode/UserInterface/RiuTimeHistoryQwtPlot.cpp
index 8c3551f3ad..09fe3bd589 100644
--- a/ApplicationCode/UserInterface/RiuTimeHistoryQwtPlot.cpp
+++ b/ApplicationCode/UserInterface/RiuTimeHistoryQwtPlot.cpp
@@ -28,12 +28,13 @@
 #include "cvfAssert.h"
 #include "cvfColor3.h"
 
-#include "qwt_legend.h"
-#include "qwt_plot_curve.h"
-#include "qwt_plot_layout.h"
-#include "qwt_scale_engine.h"
 #include "qwt_date_scale_draw.h"
 #include "qwt_date_scale_engine.h"
+#include "qwt_legend.h"
+#include "qwt_plot_curve.h"
+#include "qwt_plot_grid.h"
+#include "qwt_plot_layout.h"
+#include "qwt_scale_engine.h"
 
 
 //--------------------------------------------------------------------------------------------------
@@ -42,6 +43,9 @@
 RiuTimeHistoryQwtPlot::RiuTimeHistoryQwtPlot(QWidget* parent)
     : QwtPlot(parent)
 {
+    m_grid = new QwtPlotGrid;
+    m_grid->attach(this);
+
     setDefaults();
 }
 
@@ -51,6 +55,9 @@ RiuTimeHistoryQwtPlot::RiuTimeHistoryQwtPlot(QWidget* parent)
 RiuTimeHistoryQwtPlot::~RiuTimeHistoryQwtPlot()
 {
     deleteAllCurves();
+
+    m_grid->detach();
+    delete m_grid;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -60,17 +67,19 @@ void RiuTimeHistoryQwtPlot::addCurve(const QString& curveName, const std::vector
 {
     CVF_ASSERT(dateTimes.size() == timeHistoryValues.size());
 
-    std::vector< std::pair<size_t, size_t> > intervalsOfValidValues;
-    RigCurveDataTools::calculateIntervalsOfValidValues(timeHistoryValues, &intervalsOfValidValues);
-
     std::vector<double> filteredTimeHistoryValues;
-    RigCurveDataTools::getValuesByIntervals(timeHistoryValues, intervalsOfValidValues, &filteredTimeHistoryValues);
-
     std::vector<QDateTime> filteredDateTimes;
-    RigCurveDataTools::getValuesByIntervals(dateTimes, intervalsOfValidValues, &filteredDateTimes);
-    
     std::vector< std::pair<size_t, size_t> > filteredIntervals;
-    RigCurveDataTools::computePolyLineStartStopIndices(intervalsOfValidValues, &filteredIntervals);
+
+    {
+        std::vector< std::pair<size_t, size_t> > intervalsOfValidValues;
+        RigCurveDataTools::calculateIntervalsOfValidValues(timeHistoryValues, &intervalsOfValidValues);
+
+        RigCurveDataTools::getValuesByIntervals(timeHistoryValues,  intervalsOfValidValues, &filteredTimeHistoryValues);
+        RigCurveDataTools::getValuesByIntervals(dateTimes,          intervalsOfValidValues, &filteredDateTimes);
+    
+        RigCurveDataTools::computePolyLineStartStopIndices(intervalsOfValidValues, &filteredIntervals);
+    }
     
     RiuLineSegmentQwtPlotCurve* plotCurve = new RiuLineSegmentQwtPlotCurve("Curve 1");
 
@@ -146,6 +155,10 @@ void RiuTimeHistoryQwtPlot::setDefaults()
     canvas()->setMouseTracking(true);
     canvas()->installEventFilter(this);
 
+    QPen gridPen(Qt::SolidLine);
+    gridPen.setColor(Qt::lightGray);
+    m_grid->setPen(gridPen);
+
     enableAxis(QwtPlot::xBottom, true);
     enableAxis(QwtPlot::yLeft, true);
     enableAxis(QwtPlot::xTop, false);
diff --git a/ApplicationCode/UserInterface/RiuTimeHistoryQwtPlot.h b/ApplicationCode/UserInterface/RiuTimeHistoryQwtPlot.h
index 1caff45db1..6f39124dc5 100644
--- a/ApplicationCode/UserInterface/RiuTimeHistoryQwtPlot.h
+++ b/ApplicationCode/UserInterface/RiuTimeHistoryQwtPlot.h
@@ -22,6 +22,7 @@
 #include "qwt_plot.h"
 
 class QwtPlotCurve;
+class QwtPlotGrid;
 
 //==================================================================================================
 //
@@ -43,6 +44,7 @@ private:
     void setDefaults();
 
 private:
-    std::vector<QwtPlotCurve*> m_plotCurves;
+    std::vector<QwtPlotCurve*>  m_plotCurves;
+    QwtPlotGrid*                m_grid;
 };