diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index 6aec110b13..c8c446df81 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -2552,8 +2552,8 @@ public:
 				break;
 
 			case WID_O_ADD_VEH_GROUP: {
-				this->SetDirty();
-				DoCommandP(0, this->vehicle->index | 0,0 , CMD_CREATE_GROUP_AUTO_NAME, nullptr, nullptr);
+				this->query_text_widget = WID_O_ADD_VEH_GROUP;
+				ShowQueryString(STR_EMPTY, STR_GROUP_RENAME_CAPTION, MAX_LENGTH_GROUP_NAME_CHARS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT | QSF_LEN_IN_CHARS);
 				break;
 			}
 
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 195cbd3157..9b7fabffee 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -2346,11 +2346,7 @@ public:
 						break;
 
 					case ADI_CREATE_GROUP:
-						if (!this->vehicles.empty()) {
-							const VehicleID vindex = (*this->vehicles.begin())->index;
-							this->SetDirty();
-							DoCommandP(0, vindex | (1 << 31),0 , CMD_CREATE_GROUP_AUTO_NAME, nullptr, nullptr);
-						}
+						ShowQueryString(STR_EMPTY, STR_GROUP_RENAME_CAPTION, MAX_LENGTH_GROUP_NAME_CHARS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT | QSF_LEN_IN_CHARS);
 						break;
 
 					case ADI_TRACERESTRICT_SLOT_MGMT: {