diff --git a/ChangeLog b/ChangeLog
index 676fed301..100d8be1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,16 @@
+2013-02-22  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/GSToolTips.m
+	* Source/NSProgressIndicator.m
+	* Source/NSTextView.m: Add the timers for NSModalPanelRunLoopMode
+	as well.
+
 2013-02-22  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSTabView.m (-minimumSize, -contentRect): Make the values
 	here consistent with the code in GSThemeDrawing.
 	* Source/GSThemeDrawing.m (-drawTabViewRect:...): Remove useless
-	line of code. 
+	line of code.
 
 2013-02-21 Riccardo Mottola <rm@gnu.org>
 
diff --git a/Source/GSToolTips.m b/Source/GSToolTips.m
index 827230cef..e8e471de1 100644
--- a/Source/GSToolTips.m
+++ b/Source/GSToolTips.m
@@ -26,11 +26,13 @@
 */
 
 #import <Foundation/NSGeometry.h>
+#import <Foundation/NSRunLoop.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSTimer.h>
 #import <Foundation/NSIndexSet.h>
 #import <Foundation/NSUserDefaults.h>
 
+#import "AppKit/NSApplication.h"
 #import "AppKit/NSAttributedString.h"
 #import "AppKit/NSBezierPath.h"
 #import "AppKit/NSEvent.h"
@@ -363,6 +365,7 @@ static BOOL		restoreMouseMoved;
                                          selector: @selector(_timedOut:)
                                          userInfo: toolTipString
                                           repeats: YES];
+  [[NSRunLoop currentRunLoop] addTimer: timer forMode: NSModalPanelRunLoopMode];
   timedObject = self;
   if ([[view window] acceptsMouseMovedEvents] == YES)
     {
diff --git a/Source/NSProgressIndicator.m b/Source/NSProgressIndicator.m
index c5ceafe2f..dcab4ae7b 100644
--- a/Source/NSProgressIndicator.m
+++ b/Source/NSProgressIndicator.m
@@ -27,8 +27,10 @@
 */
 
 #import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSRunLoop.h>
 #import <Foundation/NSThread.h>
 #import <Foundation/NSTimer.h>
+#import "AppKit/NSApplication.h"
 #import "AppKit/NSProgressIndicator.h"
 #import "AppKit/NSGraphics.h"
 #import "AppKit/NSImage.h"
@@ -132,6 +134,7 @@
                               selector: @selector(animate:)
                               userInfo: nil
                               repeats: YES]);
+      [[NSRunLoop currentRunLoop] addTimer: _timer forMode: NSModalPanelRunLoopMode];
     }
   else
     {
diff --git a/Source/NSTextView.m b/Source/NSTextView.m
index c870eef9e..0095a4e55 100644
--- a/Source/NSTextView.m
+++ b/Source/NSTextView.m
@@ -4132,6 +4132,8 @@ Figure out how the additional layout stuff is supposed to work.
                                                         selector: @selector(_blink:)
                                                         userInfo: nil
                                                          repeats: YES];
+  [[NSRunLoop currentRunLoop] addTimer: _insertionPointTimer
+                               forMode: NSModalPanelRunLoopMode];
   RETAIN(_insertionPointTimer);
 }