diff --git a/docs.html b/docs.html
index 106a4e356..20e71ef02 100644
--- a/docs.html
+++ b/docs.html
@@ -16,6 +16,7 @@ be found at the <A HREF="http://www.libsdl.org/"> main SDL page</A>.
 Major changes since SDL 1.0.0:
 </H2>
 <UL>
+	<LI> 1.2.3: Fixed flashing the screen when creating a window on BeOS
 	<LI> 1.2.3: Added double-buffering support for SVGAlib (thanks Kutak!)
 	<LI> 1.2.3: Fixed crash when using double-buffering with DGA
 	<LI> 1.2.3: Fixed resuming a paused CD on Win2K (thanks Aragorn)
diff --git a/src/video/bwindow/SDL_sysvideo.cc b/src/video/bwindow/SDL_sysvideo.cc
index 90b018f0e..362c6f1dd 100644
--- a/src/video/bwindow/SDL_sysvideo.cc
+++ b/src/video/bwindow/SDL_sysvideo.cc
@@ -393,7 +393,7 @@ static int BE_SetFullScreen(_THIS, SDL_Surface *screen, int fullscreen)
 			}
 		}
 	}
-	if ( ! fullscreen ) {
+	if ( was_fullscreen && ! fullscreen ) {
 		bscreen.SetMode(&saved_mode);
 	}
 
@@ -485,7 +485,6 @@ SDL_Surface *BE_SetVideoMode(_THIS, SDL_Surface *current,
 		current->pitch = 0;
 		current->pixels = NULL;
 		_this->UpdateRects = NULL;		
-		//		_this->ToggleFullScreen = NULL;
 	} else {
 		/* Create the BBitmap framebuffer */
 		bounds.top = 0; bounds.left = 0;