diff --git a/src/apps/showimage/ShowImageView.cpp b/src/apps/showimage/ShowImageView.cpp
index e73e2dc5b1..f569dee833 100644
--- a/src/apps/showimage/ShowImageView.cpp
+++ b/src/apps/showimage/ShowImageView.cpp
@@ -491,7 +491,6 @@ void
 ShowImageView::SetHideIdlingCursor(bool hide)
 {
 	fHideCursor = hide;
-	FitToBounds();
 }
 
 
diff --git a/src/apps/showimage/ShowImageWindow.cpp b/src/apps/showimage/ShowImageWindow.cpp
index 26a5957048..906c55d2b1 100644
--- a/src/apps/showimage/ShowImageWindow.cpp
+++ b/src/apps/showimage/ShowImageWindow.cpp
@@ -1294,6 +1294,10 @@ ShowImageWindow::_ToggleFullScreen()
 
 	fImageView->SetHideIdlingCursor(fFullScreen);
 	fImageView->SetShowCaption(fFullScreen && fShowCaption);
+
+	GetLayout()->Relayout(true);
+		// We need to manually relayout here, as the views would be relayouted
+		// later, and FitToBounds() would still have the wrong size
 	fImageView->FitToBounds();
 }