diff --git a/src/main/java/eu/crushedpixel/replaymod/events/KeyInputHandler.java b/src/main/java/eu/crushedpixel/replaymod/events/KeyInputHandler.java
index d2d28687..b451703d 100755
--- a/src/main/java/eu/crushedpixel/replaymod/events/KeyInputHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/events/KeyInputHandler.java
@@ -127,7 +127,7 @@ public class KeyInputHandler {
         //Custom registered handlers
         if(kb.getKeyDescription().equals(KeybindRegistry.KEY_ADD_MARKER) && (kb.isPressed() || kb.getKeyCode() == keyCode)) {
             if(ReplayHandler.isInReplay()) {
-                ReplayHandler.addMarker();
+                ReplayHandler.toggleMarker();
             } else if(ConnectionEventHandler.isRecording()) {
                 ConnectionEventHandler.addMarker();
             }
diff --git a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
index 477d7958..c193d2bc 100755
--- a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
@@ -181,10 +181,13 @@ public class ReplayHandler {
         Collections.sort(keyframes, new KeyframeComparator());
     }
 
-    public static void addMarker() {
-        Position pos = new Position(mc.getRenderViewEntity());
-        int timestamp = ReplayMod.replaySender.currentTimeStamp();
-        addKeyframe(new MarkerKeyframe(pos, timestamp, null));
+    public static void toggleMarker() {
+        if(selectedKeyframe instanceof MarkerKeyframe) removeKeyframe(selectedKeyframe);
+        else {
+            Position pos = new Position(mc.getRenderViewEntity());
+            int timestamp = ReplayMod.replaySender.currentTimeStamp();
+            addKeyframe(new MarkerKeyframe(pos, timestamp, null));
+        }
     }
 
     public static void addKeyframe(Keyframe keyframe) {