diff --git a/ApplicationCode/Commands/RicGridStatisticsDialog.cpp b/ApplicationCode/Commands/RicGridStatisticsDialog.cpp
index 8a4729e2cd..3aab208a90 100644
--- a/ApplicationCode/Commands/RicGridStatisticsDialog.cpp
+++ b/ApplicationCode/Commands/RicGridStatisticsDialog.cpp
@@ -67,6 +67,7 @@ RicGridStatisticsDialog::RicGridStatisticsDialog(QWidget* parent)
 
     QVBoxLayout* plotLayout = new QVBoxLayout();
     plotLayout->setSpacing(0);
+    //plotLayout->addStretch();
     plotLayout->addWidget(m_historgramPlot);
     plotLayout->addWidget(m_aggregatedPlot);
     layout->addLayout(plotLayout);
@@ -102,6 +103,7 @@ void RicGridStatisticsDialog::setInfoText(RimView* view)
         text = overlayInfo->caseInfoText();
         text += overlayInfo->resultInfoText(overlayInfo->histogramData());
         m_textEdit->setText(text);
+        adjustTextEditHeightToContent();
     }
 }
 
@@ -223,6 +225,15 @@ QwtPlotMarker* RicGridStatisticsDialog::createVerticalPlotMarker(const QColor& c
     return marker;
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicGridStatisticsDialog::adjustTextEditHeightToContent()
+{
+    int docHeight = m_textEdit->document()->size().height();
+    m_textEdit->setFixedHeight(docHeight + 10);
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/Commands/RicGridStatisticsDialog.h b/ApplicationCode/Commands/RicGridStatisticsDialog.h
index b5f8974da4..a0e01a5879 100644
--- a/ApplicationCode/Commands/RicGridStatisticsDialog.h
+++ b/ApplicationCode/Commands/RicGridStatisticsDialog.h
@@ -49,6 +49,7 @@ private:
     void                    deletePlotItems(QwtPlot* plot);
     static void             setMarkers(const Rim3dOverlayInfoConfig::HistogramData& histData, QwtPlot* plot);
     static QwtPlotMarker*   createVerticalPlotMarker(const QColor& color, double xValue);
+    void                    adjustTextEditHeightToContent();
 
 private slots:
     void slotDialogFinished();
diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
index bfcc9f2c3a..a5c1629e4b 100644
--- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
@@ -592,11 +592,14 @@ void Rim3dOverlayInfoConfig::showStatisticsInfoDialog()
 {
     if (m_viewDef)
     {
+        // Show dialog before setting data due to text edit auto height setting
+        m_gridStatisticsDialog->resize(600, 800);
+        m_gridStatisticsDialog->show();
+
         m_gridStatisticsDialog->setLabel("Grid statistics");
         m_gridStatisticsDialog->setInfoText(m_viewDef);
         m_gridStatisticsDialog->setHistogramData(m_viewDef);
-        m_gridStatisticsDialog->resize(600, 800);
-        m_gridStatisticsDialog->show();
+
         m_gridStatisticsDialog->raise();
     }
 }