diff --git a/mozilla/widget/src/beos/nsWindow.cpp b/mozilla/widget/src/beos/nsWindow.cpp
index 32ca1c83fad..2d5933540ce 100644
--- a/mozilla/widget/src/beos/nsWindow.cpp
+++ b/mozilla/widget/src/beos/nsWindow.cpp
@@ -1259,6 +1259,8 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
 	if (aCursor != mCursor) 
 	{
 		BCursor const *newCursor = B_CURSOR_SYSTEM_DEFAULT;
+		if (be_app->IsCursorHidden())
+			be_app->ShowCursor();
 		
 		// Check to see if the array has been loaded, if not, do it.
 		if (gCursorArray.Count() == 0) 
@@ -1421,7 +1423,7 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
 				break;
 
 			case eCursor_none:
-				// XXX: No suitable cursor, needs implementing
+				be_app->HideCursor();
 				break;
 
 			default: