diff --git a/src/apps/webpositive/BrowserWindow.cpp b/src/apps/webpositive/BrowserWindow.cpp
index a24afc8779..6bc4c94ecc 100644
--- a/src/apps/webpositive/BrowserWindow.cpp
+++ b/src/apps/webpositive/BrowserWindow.cpp
@@ -252,6 +252,11 @@ public:
 		SetExplicitMaxSize(BSize(15, 15));
 	}
 
+	virtual void AttachedToWindow()
+	{
+		SetToolTip(B_TRANSLATE("Close find bar"));
+	}
+
 	virtual void Draw(BRect updateRect)
 	{
 		BRect frame = Bounds();
diff --git a/src/apps/webpositive/Jamfile b/src/apps/webpositive/Jamfile
index df45942fea..a287626480 100644
--- a/src/apps/webpositive/Jamfile
+++ b/src/apps/webpositive/Jamfile
@@ -74,5 +74,5 @@ Application WebPositive :
 DoCatalogs WebPositive :
 	x-vnd.Haiku-WebPositive
 	:
-        $(sources)
+	$(sources)
 ;
diff --git a/src/apps/webpositive/tabview/TabManager.cpp b/src/apps/webpositive/tabview/TabManager.cpp
index ab2b6b5a07..787e9a4098 100644
--- a/src/apps/webpositive/tabview/TabManager.cpp
+++ b/src/apps/webpositive/tabview/TabManager.cpp
@@ -36,6 +36,7 @@
 #include <Button.h>
 #include <CardLayout.h>
 #include <ControlLook.h>
+#include <Catalog.h>
 #include <GroupView.h>
 #include <MenuBar.h>
 #include <MenuItem.h>
@@ -48,6 +49,10 @@
 #include "TabView.h"
 
 
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Tab Manager"
+
+
 const static BString kEmptyString;
 
 
@@ -579,9 +584,13 @@ WebTabView::MouseMoved(BPoint where, uint32 transit,
 			fOverCloseRect = overCloseRect;
 			ContainerView()->Invalidate(closeRect);
 		}
-	}
-
-	fController->SetToolTip(Label());
+		// Set the Tooltip
+		if (overCloseRect)
+			fController->SetToolTip(B_TRANSLATE("Close tab"));
+		else
+			fController->SetToolTip(Label());
+	} else
+		fController->SetToolTip(Label());
 
 	TabView::MouseMoved(where, transit, dragMessage);
 }