diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
index 685808f96..3d5daea11 100644
--- a/src/TerminalDisplay.cpp
+++ b/src/TerminalDisplay.cpp
@@ -298,7 +298,6 @@ TerminalDisplay::TerminalDisplay(QWidget *parent)
 ,_randomSeed(0)
 ,_resizing(false)
 ,_showTerminalSizeHint(false)
-,_terminalSizeStartup(true)
 ,_bidiEnabled(false)
 ,_actSel(0)
 ,_wordSelectionMode(false)
@@ -1104,32 +1103,37 @@ void TerminalDisplay::updateImage()
 
 void TerminalDisplay::showResizeNotification()
 {
-  if (_showTerminalSizeHint && isVisible())
-  {
-     if (_terminalSizeStartup) {
-               _terminalSizeStartup=false;
-       return;
-     }
-     if (!_resizeWidget)
-     {
-        _resizeWidget = new QLabel(i18n("Size: XXX x XXX"), this);
-        _resizeWidget->setMinimumWidth(_resizeWidget->fontMetrics().width(i18n("Size: XXX x XXX")));
-        _resizeWidget->setMinimumHeight(_resizeWidget->sizeHint().height());
-        _resizeWidget->setAlignment(Qt::AlignCenter);
+    static bool resizeForTheFirstTime = true;
+    if ( resizeForTheFirstTime )
+    {
+        // Do not display size hint when resizing for the first time.
+        // That first resizing mostly happens on startup
+        resizeForTheFirstTime = false ;
+        return;
+    }
 
-        _resizeWidget->setStyleSheet("background-color:palette(window);border-style:solid;border-width:1px;border-color:palette(dark)");
+    if (_showTerminalSizeHint && isVisible())
+    {
+        if (!_resizeWidget)
+        {
+            _resizeWidget = new QLabel(i18n("Size: XXX x XXX"), this);
+            _resizeWidget->setMinimumWidth(_resizeWidget->fontMetrics().width(i18n("Size: XXX x XXX")));
+            _resizeWidget->setMinimumHeight(_resizeWidget->sizeHint().height());
+            _resizeWidget->setAlignment(Qt::AlignCenter);
 
-        _resizeTimer = new QTimer(this);
-        _resizeTimer->setSingleShot(true);
-        connect(_resizeTimer, SIGNAL(timeout()), _resizeWidget, SLOT(hide()));
-     }
-     QString sizeStr = i18n("Size: %1 x %2", _columns, _lines);
-     _resizeWidget->setText(sizeStr);
-     _resizeWidget->move((width()-_resizeWidget->width())/2,
-                         (height()-_resizeWidget->height())/2+20);
-     _resizeWidget->show();
-     _resizeTimer->start(1000);
-  }
+            _resizeWidget->setStyleSheet("background-color:palette(window);border-style:solid;border-width:1px;border-color:palette(dark)");
+
+            _resizeTimer = new QTimer(this);
+            _resizeTimer->setSingleShot(true);
+            connect(_resizeTimer, SIGNAL(timeout()), _resizeWidget, SLOT(hide()));
+        }
+        QString sizeStr = i18n("Size: %1 x %2", _columns, _lines);
+        _resizeWidget->setText(sizeStr);
+        _resizeWidget->move((width()-_resizeWidget->width())/2,
+                (height()-_resizeWidget->height())/2+20);
+        _resizeWidget->show();
+        _resizeTimer->start(1000);
+    }
 }
 
 void TerminalDisplay::setBlinkingCursorEnabled(bool blink)
diff --git a/src/TerminalDisplay.h b/src/TerminalDisplay.h
index c1c7e9a4a..71085af56 100644
--- a/src/TerminalDisplay.h
+++ b/src/TerminalDisplay.h
@@ -395,13 +395,6 @@ public:
      * is being resized.
      */
     bool showTerminalSizeHint() { return _showTerminalSizeHint; }
-    /** 
-     * Sets whether the terminal size display is shown briefly
-     * after the widget is first shown.
-     *
-     * See setShowTerminalSizeHint() , isTerminalSizeHint()
-     */
-    void setTerminalSizeStartup(bool on) { _terminalSizeStartup=on; }
 
     /**
      * Sets the status of the BiDi rendering inside the terminal display.
diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
index ce2956a87..6047483d0 100644
--- a/src/ViewManager.cpp
+++ b/src/ViewManager.cpp
@@ -804,7 +804,6 @@ TerminalDisplay* ViewManager::createTerminalDisplay(Session* session)
    display->setBellMode(TerminalDisplay::NotifyBell);
    display->setShowTerminalSizeHint(true);
    display->setTripleClickMode(TerminalDisplay::SelectWholeLine);
-   display->setTerminalSizeStartup(true);
    display->setScrollBarPosition(TerminalDisplay::ScrollBarRight);
    display->setRandomSeed(session->sessionId() * 31);