diff --git a/headers/private/shared/AboutWindow.h b/headers/private/shared/AboutWindow.h
index 33bc35bb80..16a9f429c2 100644
--- a/headers/private/shared/AboutWindow.h
+++ b/headers/private/shared/AboutWindow.h
@@ -27,6 +27,7 @@ class BAboutWindow : public BWindow {
 	virtual					~BAboutWindow();
 
 	virtual	bool			QuitRequested();
+	virtual	void			Show();
 
 			BPoint			AboutPosition(float width, float height);
 			void			AddDescription(const char* description);
diff --git a/src/kits/shared/AboutWindow.cpp b/src/kits/shared/AboutWindow.cpp
index d8e66c262c..350968d190 100644
--- a/src/kits/shared/AboutWindow.cpp
+++ b/src/kits/shared/AboutWindow.cpp
@@ -434,6 +434,18 @@ BAboutWindow::QuitRequested()
 }
 
 
+void
+BAboutWindow::Show()
+{
+	if (IsHidden()) {
+		// move to current workspace
+		SetWorkspaces(B_CURRENT_WORKSPACE);
+	}
+
+	BWindow::Show();
+}
+
+
 //	#pragma mark - BAboutWindow public methods