diff --git a/src/gui/TrackContainerView.cpp b/src/gui/TrackContainerView.cpp
index 7c69d5eb824..b8bc6f99767 100644
--- a/src/gui/TrackContainerView.cpp
+++ b/src/gui/TrackContainerView.cpp
@@ -227,8 +227,19 @@ void TrackContainerView::scrollToTrackView( TrackView * _tv )
 void TrackContainerView::realignTracks()
 {
 	QWidget * content = m_scrollArea->widget();
-	content->setFixedWidth( width()
-				- m_scrollArea->verticalScrollBar()->width() );
+
+	//Hide the vertical scrollbar *and* its scrollbar area when not needed
+	auto verticalScrollBar = m_scrollArea->verticalScrollBar();
+	if (verticalScrollBar->maximum() == verticalScrollBar->minimum())
+	{	//min == max implies the whole editor is visible without scrolling
+		verticalScrollBar->setStyleSheet("QScrollBar {width:0px;}");
+		content->setFixedWidth( width() );
+	}
+	else
+	{	//Otherwise we need a scrollbar, so restore it's width
+		verticalScrollBar->setStyleSheet("QScrollBar {}");
+		content->setFixedWidth( width() - verticalScrollBar->width() );
+	}
 	content->setFixedHeight( content->minimumSizeHint().height() );
 
 	for( trackViewList::iterator it = m_trackViews.begin();