diff --git a/src/main/java/eu/crushedpixel/replaymod/events/KeyInputHandler.java b/src/main/java/eu/crushedpixel/replaymod/events/KeyInputHandler.java
index 48defecb..dcd79067 100755
--- a/src/main/java/eu/crushedpixel/replaymod/events/KeyInputHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/events/KeyInputHandler.java
@@ -105,7 +105,7 @@ public class KeyInputHandler {
     public void handleCustomKeybindings(KeyBinding kb, boolean found, int keyCode) {
         //Custom registered handlers
         if(kb.getKeyDescription().equals(KeybindRegistry.KEY_PLAY_PAUSE) && (kb.isPressed() || kb.getKeyCode() == keyCode) && !ReplayHandler.isInPath()) {
-            ReplayMod.overlay.playOrPause();
+            ReplayMod.overlay.togglePlayPause();
         }
 
         if(kb.getKeyDescription().equals(KeybindRegistry.KEY_ROLL_CLOCKWISE) && (kb.isKeyDown() || kb.getKeyCode() == keyCode) && !ReplayHandler.isInPath()) {
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java b/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java
index 1b024cdd..d95e2ffa 100755
--- a/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java
@@ -402,6 +402,14 @@ public class GuiReplayOverlay extends Gui {
         GlStateManager.enableBlend();
     }
 
+    public void togglePlayPause() {
+        if (ReplayMod.replaySender.paused()) {
+            ReplayMod.replaySender.setReplaySpeed(speedSlider.getSliderValue());
+        } else {
+            ReplayMod.replaySender.setReplaySpeed(0);
+        }
+    }
+
     /**
      * Dummy interface for GUI on which this replay overlay shall not be rendered.
      */