=== modified file 'eeschema/hotkeys.cpp'
--- eeschema/hotkeys.cpp	2013-01-02 08:34:46 +0000
+++ eeschema/hotkeys.cpp	2013-01-14 16:19:12 +0000
@@ -490,28 +490,25 @@
         break;
 
     case HK_DRAG:                           // Start drag
+        if( itemInEdit )
+            break;
+
+        // Fall through
+    case HK_EDIT:
+        // Edit schematic item. Do not allow sheet edition when mowing
+        // Because a sheet edition can be complex.
+        if( itemInEdit && screen->GetCurItem()->Type() == SCH_SHEET_T )
+                break;
+
+        // Fall through
     case HK_MOVE_COMPONENT_OR_ITEM:         // Start move schematic item.
     case HK_EDIT_COMPONENT_VALUE:           // Edit component value field.
     case HK_EDIT_COMPONENT_REFERENCE:       // Edit component value reference.
     case HK_EDIT_COMPONENT_FOOTPRINT:       // Edit component footprint field.
-        // These commands are allowed only when no item currently edited.
-        if( ! notBusy )
-            break;
-
-        // Fall through
-    case HK_EDIT:
-        // Edit schematic item. Do not allow sheet edition when mowing
-        // Because a sheet edition can be complex.
-        if( itemInEdit && screen->GetCurItem()->Type() == SCH_SHEET_T )
-                break;
-
-        // Fall through
     case HK_MIRROR_Y_COMPONENT:             // Mirror Y
     case HK_MIRROR_X_COMPONENT:             // Mirror X
     case HK_ORIENT_NORMAL_COMPONENT:        // Orient 0, no mirror (Component)
     case HK_ROTATE:                         // Rotate schematic item.
-        if( blocInProgress )
-            break;
         {
             // force a new item search on hot keys at current position,
             // if there is no currently edited item,

=== modified file 'eeschema/onrightclick.cpp'
--- eeschema/onrightclick.cpp	2013-01-01 20:52:37 +0000
+++ eeschema/onrightclick.cpp	2013-01-14 16:19:12 +0000
@@ -819,8 +819,8 @@
         msg = AddHotkeyName( _( "Mirror Block --" ), s_Schematic_Hokeys_Descr,
                              HK_MIRROR_X_COMPONENT );
         AddMenuItem( PopMenu, ID_SCH_MIRROR_X, msg, KiBitmap( mirror_v_xpm ) );
-        AddMenuItem( PopMenu, ID_SCH_ROTATE_CLOCKWISE, _( "Rotate Block ccw" ),
-                     KiBitmap( rotate_ccw_xpm ) );
+        msg = AddHotkeyName( _( "Rotate Block ccw" ), s_Schematic_Hokeys_Descr, HK_ROTATE );
+        AddMenuItem( PopMenu, ID_SCH_ROTATE_CLOCKWISE, msg, KiBitmap( rotate_ccw_xpm ) );
 
 #if 0
   #ifdef __WINDOWS__
@@ -851,13 +851,17 @@
 
     msg = AddHotkeyName( _( "Rotate Image" ), s_Schematic_Hokeys_Descr, HK_ROTATE );
     AddMenuItem( aPopMenu, ID_SCH_ROTATE_CLOCKWISE, msg, KiBitmap( rotate_ccw_xpm ) );
-    AddMenuItem( aPopMenu, ID_SCH_MIRROR_X, _( "Mirror --" ), KiBitmap( mirror_v_xpm ) );
-    AddMenuItem( aPopMenu, ID_SCH_MIRROR_Y, _( "Mirror ||" ), KiBitmap( mirror_h_xpm ) );
+    msg = AddHotkeyName( _( "Mirror --" ), s_Schematic_Hokeys_Descr,
+                         HK_MIRROR_X_COMPONENT );
+    AddMenuItem( aPopMenu, ID_SCH_MIRROR_X, msg, KiBitmap( mirror_v_xpm ) );
+    msg = AddHotkeyName( _( "Mirror ||" ), s_Schematic_Hokeys_Descr,
+                         HK_MIRROR_Y_COMPONENT );
+    AddMenuItem( aPopMenu, ID_SCH_MIRROR_Y, msg, KiBitmap( mirror_h_xpm ) );
+    msg = AddHotkeyName( _( "Edit Image" ), s_Schematic_Hokeys_Descr, HK_EDIT );
+    AddMenuItem( aPopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( image_xpm ) );
 
     if( aBitmap->GetFlags() == 0 )
     {
-        msg = AddHotkeyName( _( "Edit Image" ), s_Schematic_Hokeys_Descr, HK_EDIT );
-        AddMenuItem( aPopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( image_xpm ) );
         aPopMenu->AppendSeparator();
         msg = AddHotkeyName( _( "Delete Image" ), s_Schematic_Hokeys_Descr, HK_DELETE );
         AddMenuItem( aPopMenu, ID_POPUP_SCH_DELETE, msg, KiBitmap( delete_xpm ) );