diff --git a/src/gui/toolbarMenubar/AbstractItem.cpp b/src/gui/toolbarMenubar/AbstractItem.cpp
index 769cb497..d55a22fb 100644
--- a/src/gui/toolbarMenubar/AbstractItem.cpp
+++ b/src/gui/toolbarMenubar/AbstractItem.cpp
@@ -10,6 +10,7 @@ AbstractItem::AbstractItem(string id, ActionHandler* handler, ActionType action,
 	this->menuSignalHandler = 0;
 	this->group = GROUP_NOGROUP;
 	this->enabled = true;
+	this->itemActive = false;
 
 	ActionEnabledListener::registerListener(handler);
 	ActionSelectionListener::registerListener(handler);
@@ -51,12 +52,13 @@ void AbstractItem::actionSelected(ActionGroup group, ActionType action)
 		return;
 	}
 
+	itemActive = this->action == action;
+
 	if (this->menuitem && GTK_IS_CHECK_MENU_ITEM(this->menuitem))
 	{
-		bool selected = this->action == action;
-		if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(this->menuitem)) != selected)
+		if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(this->menuitem)) != itemActive)
 		{
-			gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(this->menuitem), selected);
+			gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(this->menuitem), itemActive);
 		}
 	}
 	selected(group, action);
@@ -98,10 +100,27 @@ void AbstractItem::activated(GdkEvent* event, GtkMenuItem* menuitem, GtkToolButt
 		if (GTK_IS_CHECK_MENU_ITEM(menuitem))
 		{
 			selected = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem));
-			if (!selected && gtk_check_menu_item_get_draw_as_radio(GTK_CHECK_MENU_ITEM(menuitem)))
+
+			if (gtk_check_menu_item_get_draw_as_radio(GTK_CHECK_MENU_ITEM(menuitem)))
 			{
-				// Unselect radio menu item
-				return;
+				if (itemActive && !selected)
+				{
+					// Unselect radio menu item, select again
+					gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(this->menuitem), true);
+					return;
+				}
+
+				if (itemActive == selected)
+				{
+					// State not changed, this event is probably from GTK generated
+					return;
+				}
+
+				if (!selected)
+				{
+					// Unselect radio menu item
+					return;
+				}
 			}
 		}
 	}
diff --git a/src/gui/toolbarMenubar/AbstractItem.h b/src/gui/toolbarMenubar/AbstractItem.h
index 186cf8a6..f0add8bf 100644
--- a/src/gui/toolbarMenubar/AbstractItem.h
+++ b/src/gui/toolbarMenubar/AbstractItem.h
@@ -60,4 +60,9 @@ protected:
 private:
 	gulong menuSignalHandler;
 	GtkWidget* menuitem;
+
+	/**
+	 * Keep the state for toggle / radio menu handling
+	 */
+	bool itemActive;
 };
diff --git a/ui/main.glade b/ui/main.glade
index 5650d939..0f88cd0a 100644
--- a/ui/main.glade
+++ b/ui/main.glade
@@ -87,8 +87,8 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <accelerator key="s" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                         <accelerator key="u" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="s" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
@@ -112,8 +112,8 @@
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Export as...</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="e" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                         <accelerator key="i" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="e" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
@@ -354,8 +354,8 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <accelerator key="plus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <accelerator key="KP_Add" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="plus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
@@ -365,8 +365,8 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <accelerator key="minus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <accelerator key="KP_Subtract" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="minus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
@@ -858,7 +858,7 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkRadioMenuItem" id="menuToolsSelectRegion">
+                      <object class="GtkCheckMenuItem" id="menuToolsSelectRegion">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Select Region</property>
@@ -868,45 +868,41 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkRadioMenuItem" id="menuToolsSelectRectangle">
+                      <object class="GtkCheckMenuItem" id="menuToolsSelectRectangle">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Select Rectangle</property>
                         <property name="use_underline">True</property>
                         <property name="draw_as_radio">True</property>
-                        <property name="group">menuToolsSelectRegion</property>
                         <accelerator key="r" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkRadioMenuItem" id="menuToolsSelectObject">
+                      <object class="GtkCheckMenuItem" id="menuToolsSelectObject">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Select Object</property>
                         <property name="use_underline">True</property>
                         <property name="draw_as_radio">True</property>
-                        <property name="group">menuToolsSelectRegion</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkRadioMenuItem" id="menuToolsVerticalSpace">
+                      <object class="GtkCheckMenuItem" id="menuToolsVerticalSpace">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">_Vertical Space</property>
                         <property name="use_underline">True</property>
                         <property name="draw_as_radio">True</property>
-                        <property name="group">menuToolsSelectRegion</property>
                         <accelerator key="v" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkRadioMenuItem" id="menuToolsHand">
+                      <object class="GtkCheckMenuItem" id="menuToolsHand">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">H_and Tool</property>
                         <property name="use_underline">True</property>
                         <property name="draw_as_radio">True</property>
-                        <property name="group">menuToolsSelectRegion</property>
                         <accelerator key="a" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                       </object>
                     </child>
@@ -927,7 +923,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
-                              <object class="GtkRadioMenuItem" id="penthicknessVeryFine">
+                              <object class="GtkCheckMenuItem" id="penthicknessVeryFine">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">_very fine</property>
@@ -936,43 +932,39 @@
                               </object>
                             </child>
                             <child>
-                              <object class="GtkRadioMenuItem" id="penthicknessFine">
+                              <object class="GtkCheckMenuItem" id="penthicknessFine">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">_fine</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
-                                <property name="group">penthicknessVeryFine</property>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkRadioMenuItem" id="penthicknessMedium">
+                              <object class="GtkCheckMenuItem" id="penthicknessMedium">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">_medium</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
-                                <property name="group">penthicknessVeryFine</property>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkRadioMenuItem" id="penthicknessThick">
+                              <object class="GtkCheckMenuItem" id="penthicknessThick">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">_thick</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
-                                <property name="group">penthicknessVeryFine</property>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkRadioMenuItem" id="penthicknessVeryThick">
+                              <object class="GtkCheckMenuItem" id="penthicknessVeryThick">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">ver_y thick</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
-                                <property name="group">penthicknessVeryFine</property>
                               </object>
                             </child>
                           </object>
@@ -990,7 +982,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
-                              <object class="GtkRadioMenuItem" id="eraserFine">
+                              <object class="GtkCheckMenuItem" id="eraserFine">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">_fine</property>
@@ -999,23 +991,21 @@
                               </object>
                             </child>
                             <child>
-                              <object class="GtkRadioMenuItem" id="eraserMedium">
+                              <object class="GtkCheckMenuItem" id="eraserMedium">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">_medium</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
-                                <property name="group">eraserFine</property>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkRadioMenuItem" id="eraserThick">
+                              <object class="GtkCheckMenuItem" id="eraserThick">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">_thick</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
-                                <property name="group">eraserFine</property>
                               </object>
                             </child>
                             <child>
@@ -1025,7 +1015,7 @@
                               </object>
                             </child>
                             <child>
-                              <object class="GtkRadioMenuItem" id="eraserStandard">
+                              <object class="GtkCheckMenuItem" id="eraserStandard">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">_standard</property>
@@ -1034,23 +1024,21 @@
                               </object>
                             </child>
                             <child>
-                              <object class="GtkRadioMenuItem" id="eraserWhiteout">
+                              <object class="GtkCheckMenuItem" id="eraserWhiteout">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">_whiteout</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
-                                <property name="group">eraserStandard</property>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkRadioMenuItem" id="eraserDeleteStrokes">
+                              <object class="GtkCheckMenuItem" id="eraserDeleteStrokes">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">_delete strokes</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
-                                <property name="group">eraserStandard</property>
                               </object>
                             </child>
                           </object>
@@ -1068,7 +1056,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
-                              <object class="GtkRadioMenuItem" id="highlighterFine">
+                              <object class="GtkCheckMenuItem" id="highlighterFine">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">_fine</property>
@@ -1077,23 +1065,21 @@
                               </object>
                             </child>
                             <child>
-                              <object class="GtkRadioMenuItem" id="highlighterMedium">
+                              <object class="GtkCheckMenuItem" id="highlighterMedium">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">_medium</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
-                                <property name="group">highlighterFine</property>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkRadioMenuItem" id="highlighterThick">
+                              <object class="GtkCheckMenuItem" id="highlighterThick">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">_thick</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
-                                <property name="group">highlighterFine</property>
                               </object>
                             </child>
                           </object>