Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp	(revision 43591)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp	(revision 43592)
@@ -521,5 +521,5 @@
 void UIGChooserModel::startEditingGroupItemName()
 {
-    sltStartEditingSelectedGroup();
+    sltEditGroupName();
 }
 
@@ -693,5 +693,5 @@
 }
 
-void UIGChooserModel::sltAddGroupBasedOnChosenItems()
+void UIGChooserModel::sltGroupSelectedMachines()
 {
     /* Create new group in the current root: */
@@ -713,5 +713,5 @@
                 /* Add name to busy: */
                 busyGroupNames << pItem->name();
-                /* Copy or move group item: */
+                /* Copy or move group-item: */
                 new UIGChooserItemGroup(pNewGroupItem, pItem->toGroupItem());
                 delete pItem;
@@ -740,5 +740,5 @@
 }
 
-void UIGChooserModel::sltStartEditingSelectedGroup()
+void UIGChooserModel::sltEditGroupName()
 {
     /* Check if action is enabled: */
@@ -756,9 +756,13 @@
 void UIGChooserModel::sltSortGroup()
 {
-    if (isSingleGroupSelected())
-        sortItems(currentItem());
-}
-
-void UIGChooserModel::sltRemoveCurrentlySelectedGroup()
+    /* Only for single selected group: */
+    if (!isSingleGroupSelected())
+        return;
+
+    /* Sorting group: */
+    sortItems(currentItem());
+}
+
+void UIGChooserModel::sltUngroupSelectedGroup()
 {
     /* Make sure focus item is of group type! */
@@ -873,6 +877,10 @@
 void UIGChooserModel::sltSortParentGroup()
 {
-    if (!currentItems().isEmpty())
-        sortItems(currentItem()->parentItem());
+    /* Only if some item selected: */
+    if (!currentItem())
+        return;
+
+    /* Sorting parent group: */
+    sortItems(currentItem()->parentItem());
 }
 
@@ -910,5 +918,5 @@
 }
 
-void UIGChooserModel::sltRemoveCurrentlySelectedMachine()
+void UIGChooserModel::sltRemoveSelectedMachine()
 {
     /* Enumerate all the selected machine-items: */
@@ -1131,11 +1139,11 @@
             this, SLOT(sltCreateNewMachine()));
     connect(gActionPool->action(UIActionIndexSelector_Simple_Group_Rename), SIGNAL(triggered()),
-            this, SLOT(sltStartEditingSelectedGroup()));
+            this, SLOT(sltEditGroupName()));
     connect(gActionPool->action(UIActionIndexSelector_Simple_Group_Remove), SIGNAL(triggered()),
-            this, SLOT(sltRemoveCurrentlySelectedGroup()));
+            this, SLOT(sltUngroupSelectedGroup()));
     connect(gActionPool->action(UIActionIndexSelector_Simple_Machine_Remove), SIGNAL(triggered()),
-            this, SLOT(sltRemoveCurrentlySelectedMachine()));
+            this, SLOT(sltRemoveSelectedMachine()));
     connect(gActionPool->action(UIActionIndexSelector_Simple_Machine_AddGroup), SIGNAL(triggered()),
-            this, SLOT(sltAddGroupBasedOnChosenItems()));
+            this, SLOT(sltGroupSelectedMachines()));
     connect(gActionPool->action(UIActionIndexSelector_Simple_Common_Refresh), SIGNAL(triggered()),
             this, SLOT(sltPerformRefreshAction()));
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.h	(revision 43591)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.h	(revision 43592)
@@ -175,8 +175,8 @@
 
     /* Handlers: Group-item stuff: */
-    void sltAddGroupBasedOnChosenItems();
-    void sltStartEditingSelectedGroup();
+    void sltGroupSelectedMachines();
+    void sltEditGroupName();
     void sltSortGroup();
-    void sltRemoveCurrentlySelectedGroup();
+    void sltUngroupSelectedGroup();
 
     /* Handlers: Machine-item stuff: */
@@ -185,5 +185,5 @@
     void sltSortParentGroup();
     void sltPerformRefreshAction();
-    void sltRemoveCurrentlySelectedMachine();
+    void sltRemoveSelectedMachine();
 
     /* Handlers: Drag&drop stuff: */