diff --git a/src/os2/accel.cpp b/src/os2/accel.cpp
index 1fdc45861f..bda2003f77 100644
--- a/src/os2/accel.cpp
+++ b/src/os2/accel.cpp
@@ -89,8 +89,8 @@ wxAcceleratorTable::wxAcceleratorTable(
         wxFrame*                    pFrame = (wxFrame*)wxTheApp->GetTopWindow();
 
         ::WinSetAccelTable( vHabmain
-                           ,(HWND)pFrame->GetFrame()
                            ,hAccel
+                           ,(HWND)pFrame->GetFrame()
                           );
     }
     M_ACCELDATA->m_hAccel = hAccel;
@@ -152,8 +152,8 @@ wxAcceleratorTable::wxAcceleratorTable(
         wxFrame*                    pFrame = (wxFrame*)wxTheApp->GetTopWindow();
 
         ::WinSetAccelTable( vHabmain
-                           ,(HWND)pFrame->GetFrame()
                            ,M_ACCELDATA->m_hAccel
+                           ,(HWND)pFrame->GetFrame()
                           );
     }
 
diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 4aa19bee52..79f7247026 100644
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -733,14 +733,15 @@ bool wxApp::ProcessMessage(
     // Try translations first; find the youngest window with
     // a translation table.
     //
-#if 0
-    for (pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() )
+    if(pMsg->msg == WM_CHAR)
     {
-        if (pMsg->msg == WM_CHAR)
-            if (pWnd->OS2TranslateMessage(pWxmsg))
-                return TRUE;
+       for(pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() )
+       {
+            if(pWnd->OS2TranslateMessage(pWxmsg))
+               break;
+       }
     }
-#endif
+
     //
     // Anyone for a non-translation message? Try youngest descendants first.
     //