diff --git a/source/UI/js/Video/VideoAnnotationPanel.js b/source/UI/js/Video/VideoAnnotationPanel.js
index c5ea1af7..ea3be800 100644
--- a/source/UI/js/Video/VideoAnnotationPanel.js
+++ b/source/UI/js/Video/VideoAnnotationPanel.js
@@ -1318,10 +1318,12 @@ Ox.VideoAnnotationPanel = function(options, self) {
         // FIXME
         // self.editing = false;
         if (data.id) {
-            if (!stayAtPosition
-                || self.options.annotationsRange != 'position'
-                || self.options.position < data['in']
-                || self.options.position > data.out
+            if (!stayAtPosition || (
+                    self.options.annotationsRange != 'position' && (
+                        self.options.position < data['in']
+                        || self.options.position > data.out
+                    )
+                )
             ) {
                 setPosition(data['in']);
                 // if annotationsRange is 'position',