diff --git a/Source/SliderWithValue.m b/Source/SliderWithValue.m
index 48ec388a6..6d5f0f027 100644
--- a/Source/SliderWithValue.m
+++ b/Source/SliderWithValue.m
@@ -47,6 +47,10 @@ + (void)setString:(NSString *)string atPoint:(NSPoint)point
 
 + (void)releaseToolTip
 {
+    if (sharedToolTip != nil && sharedToolTip->window != nil) {
+        [sharedToolTip->window close];
+    }
+
     sharedToolTip = nil;
 }
 
@@ -71,7 +75,7 @@ - (id)init
 	[window setBackgroundColor:[NSColor colorWithDeviceRed:1.0 green:0.96 blue:0.76 alpha:1.0]];
 	[window setHasShadow:YES];
 	[window setLevel:NSStatusWindowLevel];
-	[window setReleasedWhenClosed:YES];
+	[window setReleasedWhenClosed:NO];
 	[window orderFront:nil];
     
 	textField = [[ToolTipTextField alloc] initWithFrame:textFieldFrame];