diff --git a/ChangeLog b/ChangeLog
index 3bfb45bb6..9f52d8f3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-23  Germán Arias <germanandre@gmx.es>
+
+	* Source/GSToolTips.m (+initialize):
+	* Source/GSAutocompleteWindow.m (+defaultWindow):
+	* Source/NSComboBoxCell.m (+defaultPopUp): Revert last commits.
+
 2015-02-23  Germán Arias <germanandre@gmx.es>
 
 	* Source/GSToolTips.m (+initialize): Use buffered window and
diff --git a/Source/GSAutocompleteWindow.m b/Source/GSAutocompleteWindow.m
index 234b101e0..751e03579 100644
--- a/Source/GSAutocompleteWindow.m
+++ b/Source/GSAutocompleteWindow.m
@@ -63,7 +63,7 @@ static GSAutocompleteWindow *gsWindow = nil;
   if (gsWindow == nil)
     gsWindow = [[self alloc] initWithContentRect: NSMakeRect(0,0,200,200)
 			               styleMask: NSBorderlessWindowMask
-			                 backing: NSBackingStoreBuffered
+			                 backing: backing: NSBackingStoreNonretained
 			                   defer: YES];
 
   return gsWindow;
diff --git a/Source/GSToolTips.m b/Source/GSToolTips.m
index 6a5dfe077..965e2c23f 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: NSBackingStoreBuffered
+					 backing: NSBackingStoreRetained
 					   defer: YES];
     
   [window setBackgroundColor:
@@ -241,6 +241,7 @@ static BOOL		restoreMouseMoved;
   [window setReleasedWhenClosed: NO];
   [window setExcludedFromWindowsMenu: YES];
   [window setLevel: NSPopUpMenuWindowLevel];
+  [window setAutodisplay: NO];
 }
 
 + (void) removeTipsForView: (NSView*)aView
diff --git a/Source/NSComboBoxCell.m b/Source/NSComboBoxCell.m
index 1c428c001..47dbe7d4f 100644
--- a/Source/NSComboBoxCell.m
+++ b/Source/NSComboBoxCell.m
@@ -120,7 +120,7 @@ static GSComboWindow *gsWindow = nil;
   if (gsWindow == nil)
     gsWindow = [[self alloc] initWithContentRect: NSMakeRect(0,0,200,200)
 			               styleMask: NSBorderlessWindowMask
-			                 backing: NSBackingStoreBuffered
+			                 backing: backing: NSBackingStoreNonretained // NSBackingStoreBuffered
 			                   defer: YES];
   return gsWindow;
 }