diff --git a/src/app_shell.cpp b/src/app_shell.cpp
index 8d51025..01c1572 100644
--- a/src/app_shell.cpp
+++ b/src/app_shell.cpp
@@ -85,6 +85,10 @@ void App::shutdown_curses() {
 }
 
 void App::draw() {
+	if (!attachment_viewer_open_ && !saved_animation_menu_open_) {
+		clear_attachment_preview_graphics();
+	}
+
 	erase();
 
 	int height = 0;
@@ -175,8 +179,6 @@ void App::draw() {
 		draw_forward_target_menu(height, width);
 	} else if (help_menu_open_) {
 		draw_help_menu(height, width);
-	} else {
-		clear_attachment_preview_graphics();
 	}
 }