diff --git a/ChangeLog b/ChangeLog
index 693182679..3bfb45bb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-23  Germán Arias <germanandre@gmx.es>
+
+	* Source/GSToolTips.m (+initialize): Use buffered window and
+	allow autodisplay. Set auto display to NO maybe was needed in the
+	past, but currently is not needed anymore and interferes with the
+	display of tooltips on Windows.
+
 2015-02-23  Germán Arias <germanandre@gmx.es>
 
 	* Source/GSAutocompleteWindow.m (+defaultWindow):
diff --git a/Source/GSToolTips.m b/Source/GSToolTips.m
index 965e2c23f..6a5dfe077 100644
--- a/Source/GSToolTips.m
+++ b/Source/GSToolTips.m
@@ -233,7 +233,7 @@ static BOOL		restoreMouseMoved;
            
   window = [[GSTTPanel alloc] initWithContentRect: NSMakeRect(0,0,100,25)
 				       styleMask: NSBorderlessWindowMask
-					 backing: NSBackingStoreRetained
+					 backing: NSBackingStoreBuffered
 					   defer: YES];
     
   [window setBackgroundColor:
@@ -241,7 +241,6 @@ static BOOL		restoreMouseMoved;
   [window setReleasedWhenClosed: NO];
   [window setExcludedFromWindowsMenu: YES];
   [window setLevel: NSPopUpMenuWindowLevel];
-  [window setAutodisplay: NO];
 }
 
 + (void) removeTipsForView: (NSView*)aView