diff --git a/Multiplayer/client.cpp b/Multiplayer/client.cpp
index a04ba4ad5..1dc82f544 100644
--- a/Multiplayer/client.cpp
+++ b/Multiplayer/client.cpp
@@ -2527,6 +2527,9 @@ void reapplySETTINGS()
 	// Set fast loading of WWW sites
 	gfTemporaryDisablingOfLoadPendingFlag = TRUE;
 
+	// WANNE: This should fix the bug playing a "tilt" sound and showing the mini laptop graphic on the screen, when opening the laptop / option screen from map screen
+	gfDontStartTransitionFromLaptop = TRUE;
+
 	gMercProfiles[ 57 ].sSalary = 2000;
 	gMercProfiles[ 58 ].sSalary = 1500;
 	gMercProfiles[ 59 ].sSalary = 600;
@@ -4768,6 +4771,9 @@ void connect_client ( void )
 		
 		// Set fast loading of WWW sites
 		gfTemporaryDisablingOfLoadPendingFlag = TRUE;
+
+		// WANNE: This should fix the bug playing a "tilt" sound and showing the mini laptop graphic on the screen, when opening the laptop / option screen from map screen from map screen
+		gfDontStartTransitionFromLaptop = TRUE;
 										
 		//**********************
 
diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp
index eee33931e..39b68a3b0 100644
--- a/Strategic/mapscreen.cpp
+++ b/Strategic/mapscreen.cpp
@@ -8337,6 +8337,8 @@ void EndMapScreen( BOOLEAN fDuringFade )
 
 	if( !gfDontStartTransitionFromLaptop )
 	{
+		// WANNE: This code blocks never gets called, but this is fine, cause we don't need it. That seems to be an "old" unused code block!
+		
 		VOBJECT_DESC	VObjectDesc;
 		UINT32 uiLaptopOn;
 
@@ -8346,8 +8348,8 @@ void EndMapScreen( BOOLEAN fDuringFade )
 		sprintf( VObjectDesc.ImageFile, "INTERFACE\\LaptopOn.sti" );
 		if( !AddVideoObject( &VObjectDesc, &uiLaptopOn ) )
 			AssertMsg( 0, "Failed to load data\\Interface\\LaptopOn.sti" );
-		BltVideoObjectFromIndex( FRAME_BUFFER, uiLaptopOn, 0, 465, 417, VO_BLT_SRCTRANSPARENCY, NULL );
-		InvalidateRegion( 465, 417, 480, 427 );
+		BltVideoObjectFromIndex( FRAME_BUFFER, uiLaptopOn, 0, iScreenWidthOffset + 465, iScreenHeightOffset + 417, VO_BLT_SRCTRANSPARENCY, NULL );
+		InvalidateRegion( iScreenWidthOffset + 465, iScreenHeightOffset + 417, iScreenWidthOffset + 480, iScreenHeightOffset + 427 );
 		ExecuteBaseDirtyRectQueue( );
 		EndFrameBufferRender( );
 		DeleteVideoObjectFromIndex( uiLaptopOn );