diff --git a/src/Renderer/UI/ModelHelpers.fs b/src/Renderer/UI/ModelHelpers.fs
index 85c163431..14c56134b 100644
--- a/src/Renderer/UI/ModelHelpers.fs
+++ b/src/Renderer/UI/ModelHelpers.fs
@@ -9,7 +9,7 @@ open Optics.Operators
 
 module Constants =
     /// TODO: Remove this limit, after making simulation interruptable This stops the waveform simulator moving past 1000 clock cycles.
-    let maxLastClk = 2000
+    let maxLastClk = 10000
     /// Needed to prevent possible overrun of simulation arrays
     let maxStepsOverflow = 3
 
diff --git a/src/Renderer/UI/WaveSim/WaveSim.fs b/src/Renderer/UI/WaveSim/WaveSim.fs
index 514efba8d..538a41393 100644
--- a/src/Renderer/UI/WaveSim/WaveSim.fs
+++ b/src/Renderer/UI/WaveSim/WaveSim.fs
@@ -942,10 +942,7 @@ let generateScrollbarInfo (wsm: WaveSimModel): {| tbWidth: float; tbPos: float;
     let tbWidth = max tbCalcWidth WaveSimStyle.Constants.scrollbarThumbMinWidth
     
     let tbMoveWidth = bkgWidth - tbWidth
-    let tbPos =
-        if tbWidth > WaveSimStyle.Constants.scrollbarThumbMinWidth
-        then (float wsm.StartCycle) / (float newBkgRep - float wsm.ShownCycles) * tbMoveWidth
-        else (float wsm.CurrClkCycle) / (float newBkgRep-1.) * tbMoveWidth
+    let tbPos = (float wsm.StartCycle) / (float newBkgRep - float wsm.ShownCycles) * tbMoveWidth
 
     // debug statements:
     // printfn "DEBUG:generateScrollbarInfo: Input -"
@@ -953,6 +950,7 @@ let generateScrollbarInfo (wsm: WaveSimModel): {| tbWidth: float; tbPos: float;
     // printfn "DEBUG:generateScrollbarInfo: wsm.StartCycle = %d cycles" wsm.StartCycle
     // printfn "DEBUG:generateScrollbarInfo: wsm.ShownCycles = %d cycles" wsm.ShownCycles
     // printfn "DEBUG:generateScrollbarInfo: wsm.ScrollbarBkgRepCycs = %d cycles" wsm.ScrollbarBkgRepCycs
+    // printfn "DEBUG:generateScrollbarInfo: bkgWidth = %.1f cycles" bkgWidth
     // printfn "DEBUG:generateScrollbarInfo: Output -"
     // printfn "DEBUG:generateScrollbarInfo: tbWidth = %.1fpx" tbWidth
     // printfn "DEBUG:generateScrollbarInfo: tbPos = %.1fpx" tbPos