diff --git a/src/client/component/gui_entity_list.cpp b/src/client/component/gui_entity_list.cpp
index f5c276ed..4a6e1dda 100644
--- a/src/client/component/gui_entity_list.cpp
+++ b/src/client/component/gui_entity_list.cpp
@@ -842,7 +842,7 @@ namespace entity_list
 					show_selected_fields_window(data);
 				}
 
-				if (selected_entity && set_field_window)
+				if (set_field_window)
 				{
 					show_set_field_window(data);
 				}