diff --git a/src/display.cpp b/src/display.cpp
index 974d193e8e3c..3162a761ae28 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -1746,14 +1746,10 @@ void display::draw_init()
 		invalidateAll_ = true;
 	}
 
-#ifdef SDL_GPU
-	draw_all_panels();
-#else
 	if(!panelsDrawn_) {
 		draw_all_panels();
 		panelsDrawn_ = true;
 	}
-#endif
 
 	if(redraw_background_) {
 		// Full redraw of the background
diff --git a/src/game_display.cpp b/src/game_display.cpp
index 44e17ecbe80d..50395a724351 100644
--- a/src/game_display.cpp
+++ b/src/game_display.cpp
@@ -466,6 +466,10 @@ void game_display::draw_sidebar()
 	{
 		wb::future_map future; // start planned unit map scope
 
+#ifdef SDL_GPU
+		draw_all_panels();
+#endif
+
 		// We display the unit the mouse is over if it is over a unit,
 		// otherwise we display the unit that is selected.
 		BOOST_FOREACH(const std::string &name, reports::report_list()) {