diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
--- a/src/TerminalDisplay.cpp
+++ b/src/TerminalDisplay.cpp
@@ -2037,7 +2037,7 @@
 
     if (position == Enum::ScrollBarHidden) {
         _scrollBar->hide();
-    } else {
+    } else if (_scrollBar->maximum() != 0) {
         _scrollBar->show();
     }
 
@@ -2072,10 +2072,14 @@
     //
     // setting the range or value of a _scrollBar will always trigger
     // a repaint, so it should be avoided if it is not necessary
-    if (_scrollBar->minimum() == 0                 &&
-            _scrollBar->maximum() == (slines - _lines) &&
-            _scrollBar->value()   == cursor) {
+
+    if (_scrollBar->maximum() == 0 && _scrollBar->value() == cursor) {
+        // hide the scrollbar if it's not needed
+        _scrollBar->hide();
         return;
+
+    } else if (_scrollbarLocation != Enum::ScrollBarHidden){
+        _scrollBar->show();
     }
 
     disconnect(_scrollBar, &QScrollBar::valueChanged, this, &Konsole::TerminalDisplay::scrollBarPositionChanged);