diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index 9e97db1be5..1d74002c33 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -299,6 +299,7 @@ static void GroupWndProc(Window *w, WindowEvent *e)
 		case WE_INVALIDATE_DATA:
 			gv->l.flags |= VL_REBUILD;
 			gl->l.flags |= VL_REBUILD;
+			if (!IsValidGroupID(gv->group_sel)) gv->group_sel = ALL_GROUP;
 			UpdateGroupActionDropdown(w, gv->group_sel);
 			SetWindowDirty(w);
 			break;