diff --git a/panels/timeline.cpp b/panels/timeline.cpp
index 6bdb36602..f0ce8d905 100644
--- a/panels/timeline.cpp
+++ b/panels/timeline.cpp
@@ -756,12 +756,13 @@ void Timeline::set_zoom_value(double v) {
   zoom_just_changed = true;
 
   // set scrollbar to center the playhead
-  if (olive::ActiveSequence != nullptr
-      && !horizontalScrollBar->is_resizing()) {
+  if (olive::ActiveSequence != nullptr) {
     // update scrollbar maximum value for new zoom
     set_sb_max();
 
-    center_scroll_to_playhead(horizontalScrollBar, zoom, olive::ActiveSequence->playhead);
+    if (!horizontalScrollBar->is_resizing()) {
+      center_scroll_to_playhead(horizontalScrollBar, zoom, olive::ActiveSequence->playhead);
+    }
   }
 
   // repaint the timeline for the new zoom/location
diff --git a/ui/resizablescrollbar.cpp b/ui/resizablescrollbar.cpp
index 284a04073..aa23c960a 100644
--- a/ui/resizablescrollbar.cpp
+++ b/ui/resizablescrollbar.cpp
@@ -29,98 +29,98 @@
 #define RESIZE_HANDLE_SIZE 10
 
 ResizableScrollBar::ResizableScrollBar(QWidget *parent) :
-	QScrollBar(parent),
-	resize_init(false),
-	resize_proc(false)
+  QScrollBar(parent),
+  resize_init(false),
+  resize_proc(false)
 {
-	setSingleStep(20);
-	setMaximum(0);
-	setMouseTracking(true);
+  setSingleStep(20);
+  setMaximum(0);
+  setMouseTracking(true);
 }
 
 bool ResizableScrollBar::is_resizing() {
-	return resize_proc;
+  return resize_proc;
 }
 
 void ResizableScrollBar::resizeEvent(QResizeEvent *event) {
-	setPageStep(event->size().width());
+  setPageStep(event->size().width());
 }
 
 void ResizableScrollBar::mousePressEvent(QMouseEvent *e) {
-	if (resize_init) {
-		QStyleOptionSlider opt;
-		initStyleOption(&opt);
+  if (resize_init) {
+    QStyleOptionSlider opt;
+    initStyleOption(&opt);
 
-		QRect sr = style()->subControlRect(QStyle::CC_ScrollBar, &opt,
-											   QStyle::SC_ScrollBarSlider, this);
+    QRect sr = style()->subControlRect(QStyle::CC_ScrollBar, &opt,
+                                       QStyle::SC_ScrollBarSlider, this);
 
-		resize_proc = true;
-		resize_start = e->pos().x();
+    resize_proc = true;
+    resize_start = e->pos().x();
 
-		resize_start_max = maximum();
-		resize_start_width = sr.width();
-	} else {
-		QScrollBar::mousePressEvent(e);
-	}
+    resize_start_max = maximum();
+    resize_start_width = sr.width();
+  } else {
+    QScrollBar::mousePressEvent(e);
+  }
 }
 
 void ResizableScrollBar::mouseMoveEvent(QMouseEvent *e) {
-	QStyleOptionSlider opt;
-	initStyleOption(&opt);
+  QStyleOptionSlider opt;
+  initStyleOption(&opt);
 
-	QRect sr = style()->subControlRect(QStyle::CC_ScrollBar, &opt,
-										   QStyle::SC_ScrollBarSlider, this);
-	QRect gr = style()->subControlRect(QStyle::CC_ScrollBar, &opt,
-										   QStyle::SC_ScrollBarGroove, this);
+  QRect sr = style()->subControlRect(QStyle::CC_ScrollBar, &opt,
+                                     QStyle::SC_ScrollBarSlider, this);
+  QRect gr = style()->subControlRect(QStyle::CC_ScrollBar, &opt,
+                                     QStyle::SC_ScrollBarGroove, this);
 
-	if (resize_proc) {
-		int diff = (e->pos().x() - resize_start);
-		if (resize_top) diff = -diff;
-		double scale = double(sr.width())/double(sr.width()+diff);
-		if (!qIsInf(scale) && !qIsNull(scale)) {
-			emit resize_move(scale);
-			resize_start = e->pos().x();
+  if (resize_proc) {
+    int diff = (e->pos().x() - resize_start);
+    if (resize_top) diff = -diff;
+    double scale = double(sr.width())/double(sr.width()+diff);
+    if (!qIsInf(scale) && !qIsNull(scale)) {
+      emit resize_move(scale);
+      resize_start = e->pos().x();
 
-			if (resize_top) {
-				int slider_min = gr.x();
-				int slider_max = gr.right() - (sr.width()+diff);
-				int val = QStyle::sliderValueFromPosition(minimum(), maximum(), e->pos().x() - slider_min, slider_max - slider_min, opt.upsideDown);
+      if (resize_top) {
+        int slider_min = gr.x();
+        int slider_max = gr.right() - (sr.width()+diff);
+        int val = QStyle::sliderValueFromPosition(minimum(), maximum(), e->pos().x() - slider_min, slider_max - slider_min, opt.upsideDown);
 
-				setValue(val);
-			} else {
-				setValue(qRound(value() * scale));
-			}
-		}
-	} else {
-		bool new_resize_init = false;
+        setValue(val);
+      } else {
+        setValue(qRound(value() * scale));
+      }
+    }
+  } else {
+    bool new_resize_init = false;
 
-		if ((orientation() == Qt::Horizontal && e->pos().x() > sr.left()-RESIZE_HANDLE_SIZE && e->pos().x() < sr.left()+RESIZE_HANDLE_SIZE)
-				|| (orientation() == Qt::Vertical && e->pos().y() > sr.top()-RESIZE_HANDLE_SIZE && e->pos().y() < sr.top()+RESIZE_HANDLE_SIZE)) {
-			new_resize_init = true;
-			resize_top = true;
-		} else if ((orientation() == Qt::Horizontal && e->pos().x() > sr.right()-RESIZE_HANDLE_SIZE && e->pos().x() < sr.right()+RESIZE_HANDLE_SIZE)
-				   || (orientation() == Qt::Vertical && e->pos().y() > sr.bottom()-RESIZE_HANDLE_SIZE && e->pos().y() < sr.bottom()+RESIZE_HANDLE_SIZE)) {
-			new_resize_init = true;
-			resize_top = false;
-		}
+    if ((orientation() == Qt::Horizontal && e->pos().x() > sr.left()-RESIZE_HANDLE_SIZE && e->pos().x() < sr.left()+RESIZE_HANDLE_SIZE)
+        || (orientation() == Qt::Vertical && e->pos().y() > sr.top()-RESIZE_HANDLE_SIZE && e->pos().y() < sr.top()+RESIZE_HANDLE_SIZE)) {
+      new_resize_init = true;
+      resize_top = true;
+    } else if ((orientation() == Qt::Horizontal && e->pos().x() > sr.right()-RESIZE_HANDLE_SIZE && e->pos().x() < sr.right()+RESIZE_HANDLE_SIZE)
+               || (orientation() == Qt::Vertical && e->pos().y() > sr.bottom()-RESIZE_HANDLE_SIZE && e->pos().y() < sr.bottom()+RESIZE_HANDLE_SIZE)) {
+      new_resize_init = true;
+      resize_top = false;
+    }
 
-		if (resize_init != new_resize_init) {
-			if (new_resize_init) {
-				setCursor(Qt::SizeHorCursor);
-			} else {
-				unsetCursor();
-			}
-			resize_init = new_resize_init;
-		}
+    if (resize_init != new_resize_init) {
+      if (new_resize_init) {
+        setCursor(Qt::SizeHorCursor);
+      } else {
+        unsetCursor();
+      }
+      resize_init = new_resize_init;
+    }
 
-		QScrollBar::mouseMoveEvent(e);
-	}
+    QScrollBar::mouseMoveEvent(e);
+  }
 }
 
 void ResizableScrollBar::mouseReleaseEvent(QMouseEvent *e) {
-	if (resize_proc) {
-		resize_proc = false;
-	} else {
-		QScrollBar::mouseReleaseEvent(e);
-	}
+  if (resize_proc) {
+    resize_proc = false;
+  } else {
+    QScrollBar::mouseReleaseEvent(e);
+  }
 }