diff --git a/boot.py b/boot.py
index 56ae078db..237313ec9 100644
--- a/boot.py
+++ b/boot.py
@@ -17,6 +17,7 @@
 from .plugin.configuration import LspDisableLanguageServerInProjectCommand
 from .plugin.configuration import LspEnableLanguageServerGloballyCommand
 from .plugin.configuration import LspEnableLanguageServerInProjectCommand
+from .plugin.core.constants import ST_VERSION
 from .plugin.core.css import load as load_css
 from .plugin.core.open import opening_files
 from .plugin.core.panels import PanelName
@@ -226,18 +227,18 @@ def on_new_window_async(self, w: sublime.Window) -> None:
     def on_pre_close_window(self, w: sublime.Window) -> None:
         windows.discard(w)
 
-    # Note: EventListener.on_post_move_async does not fire when a tab is moved out of the current window in such a way
-    # that a new window is created: https://github.com/sublimehq/sublime_text/issues/4630
-    # Hence, as a workaround we use on_pre_move, which still works in that case.
     def on_pre_move(self, view: sublime.View) -> None:
-        listeners = sublime_plugin.view_event_listeners.get(view.id())
-        if not isinstance(listeners, list):
-            return
-        for listener in listeners:
-            if isinstance(listener, DocumentSyncListener):
-                # we need a small delay here, so that the DocumentSyncListener will recognize a possible new window
-                sublime.set_timeout_async(listener.on_post_move_window_async, 1)
+        if ST_VERSION < 4184:  # https://github.com/sublimehq/sublime_text/issues/4630#issuecomment-2502781628
+            # Workaround for ViewEventListener.on_post_move_async not being triggered when air-dropping a tab:
+            # https://github.com/sublimehq/sublime_text/issues/4630
+            listeners = sublime_plugin.view_event_listeners.get(view.id())
+            if not isinstance(listeners, list):
                 return
+            for listener in listeners:
+                if isinstance(listener, DocumentSyncListener):
+                    # we need a small delay here, so that the DocumentSyncListener will recognize a possible new window
+                    sublime.set_timeout_async(listener.on_post_move_window_async, 1)
+                    return
 
     def on_load(self, view: sublime.View) -> None:
         file_name = view.file_name()
diff --git a/plugin/documents.py b/plugin/documents.py
index 94c28ea79..73e0a36d2 100644
--- a/plugin/documents.py
+++ b/plugin/documents.py
@@ -385,6 +385,11 @@ def on_load_async(self) -> None:
                     partial(self._on_initial_folding_ranges, initially_folded_kinds))
         self.on_activated_async()
 
+    def on_post_move_async(self) -> None:
+        if ST_VERSION < 4184:  # Already handled in boot.Listener.on_pre_move
+            return
+        self.on_post_move_window_async()
+
     def on_activated_async(self) -> None:
         if self.view.is_loading() or not is_regular_view(self.view):
             return