diff --git a/croppa/main.py b/croppa/main.py
index 7711a41..8d7d15c 100644
--- a/croppa/main.py
+++ b/croppa/main.py
@@ -3245,8 +3245,6 @@ class VideoEditor:
                 (margin_x + 920, help_lines[mid:]),
             ]
 
-            # First, compute the background rectangle bounds for both columns to cover all lines
-            max_lines_in_col = max(len(col[1]) for col in columns)
             col_width = 890  # Leave some padding, adjust if needed
             bg_rect_margin = 12
 
@@ -4019,6 +4017,9 @@ class VideoEditor:
         # Reset display offset
         self.display_offset = [0, 0]
         
+        # Clear crop/zoom keyframes
+        self.crop_zoom_keyframes.clear()
+        
         # Clear transformation cache
         self.clear_transformation_cache()
         
@@ -4881,7 +4882,7 @@ class VideoEditor:
                     self.crop_history.append(self.crop_rect)
                 self.crop_rect = None
                 self.zoom_factor = 1.0
-                self.crop_zoom_keyframes.clear()
+                self.delete_crop_zoom_keyframe_at_current_frame()
                 self.clear_transformation_cache()
                 self.save_state()  # Save state when crop is cleared
             elif key == ord("C"):