3 files changed, 24 insertions, 0 deletions
diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index 0941ac174..cfb014197 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -235,6 +235,7 @@ public:
   void HandleCommand(NSInteger command);
 
   virtual void ActiveStateChanged(bool isActive);
+  void WindowWillMove();
 
   // Find indicator
   void ShowFindIndicatorForRange(NSRange charRange, BOOL retaining);
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 2fce53ded..6bd9d4c32 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -2450,6 +2450,17 @@ void ScintillaCocoa::ActiveStateChanged(bool isActive)
   }
 }
 
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * When the window is about to move, the calltip and autcoimpletion stay in the same spot,
+ * so cancel them.
+ */
+void ScintillaCocoa::WindowWillMove() {
+  AutoCompleteCancel();
+  ct.CallTipCancel();
+}
+
 // If building with old SDK, need to define version number for 10.8
 #ifndef NSAppKitVersionNumber10_8
 #define NSAppKitVersionNumber10_8 1187
diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index 13dd1d4f9..da16899eb 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -1192,6 +1192,11 @@ sourceOperationMaskForDraggingContext: (NSDraggingContext) context
                    name:NSApplicationDidBecomeActiveNotification
                  object:nil];
 
+    [center addObserver:self
+               selector:@selector(windowWillMove:)
+                   name:NSWindowWillMoveNotification
+                 object:[self window]];
+    
     [[scrollView contentView] setPostsBoundsChangedNotifications:YES];
     [center addObserver:self
 	       selector:@selector(scrollerAction:)
@@ -1227,6 +1232,13 @@ sourceOperationMaskForDraggingContext: (NSDraggingContext) context
 
 //--------------------------------------------------------------------------------------------------
 
+- (void) windowWillMove: (NSNotification *)note {
+#pragma unused(note)
+  mBackend->WindowWillMove();
+}
+
+//--------------------------------------------------------------------------------------------------
+
 - (void) viewDidMoveToWindow
 {
   [super viewDidMoveToWindow];