diff --git a/jGui b/jGui
index 3ec4b51e..23e291e0 160000
--- a/jGui
+++ b/jGui
@@ -1 +1 @@
-Subproject commit 3ec4b51e125d9ddd88c948615fcb8df0f95c80b9
+Subproject commit 23e291e0c370213f73dd6abd76b912628c41d71e
diff --git a/src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java b/src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java
index 78fe87d2..c3baf95a 100644
--- a/src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java
+++ b/src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java
@@ -162,7 +162,7 @@ public class GuiPathing {
         @Override
         public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo renderInfo) {
             if (player.isActive()) {
-                setCursorPosition((int) player.getTimePassed());
+                setCursorPosition((int) player.getTimePassed()).ensureCursorVisibleWithPadding();
             }
             super.draw(renderer, size, renderInfo);
         }
@@ -439,7 +439,7 @@ public class GuiPathing {
             // Cursor time passed
             int cursorPassed = (int) (timePassed / speed);
             // Move cursor to new position
-            timeline.setCursorPosition(keyframeCursor + cursorPassed);
+            timeline.setCursorPosition(keyframeCursor + cursorPassed).ensureCursorVisibleWithPadding();
             // Deselect keyframe to allow the user to add a new one right away
             mod.setSelected(null, 0);
         });