diff --git a/src/components/pages/playlists/PlaylistPlayer.vue b/src/components/pages/playlists/PlaylistPlayer.vue
index d78a68b96..d2d91485f 100644
--- a/src/components/pages/playlists/PlaylistPlayer.vue
+++ b/src/components/pages/playlists/PlaylistPlayer.vue
@@ -712,7 +712,7 @@
           :active="isZoomEnabled"
           icon="loupe"
           :title="$t('playlists.actions.annotation_zoom_pan')"
-          @click="isZoomEnabled = !isZoomEnabled"
+          @click="onPanZoomClicked()"
           v-if="isCurrentPreviewMovie || isCurrentPreviewPicture"
         />
         <transition name="slide">
@@ -2338,6 +2338,17 @@ export default {
       event.dataTransfer.setData('previewFileId', entity.preview_file_id)
     },
 
+    onPanZoomClicked() {
+      if (!this.isZoomEnabled) {
+        this.isDrawing = false
+        this.isAnnotationsDisplayed = false
+        this.isZoomEnabled = true
+      } else {
+        this.isZoomEnabled = false
+        this.isAnnotationsDisplayed = true
+      }
+    },
+
     resumePanZoom() {
       if (this.isCurrentPreviewMovie) {
         this.rawPlayer.resumePanZoom()