diff --git a/components/pochecker/pocheckermain.lfm b/components/pochecker/pocheckermain.lfm
index c1f15e8eaf..d3614d426b 100644
--- a/components/pochecker/pocheckermain.lfm
+++ b/components/pochecker/pocheckermain.lfm
@@ -35,7 +35,7 @@ object PoCheckerForm: TPoCheckerForm
       'sCheckStatistics'
     )
     ItemHeight = 17
-    TabOrder = 0
+    TabOrder = 3
     Data = {
       06000000000000000000
     }
@@ -102,7 +102,7 @@ object PoCheckerForm: TPoCheckerForm
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
     }
     OnClick = OpenBtnClick
-    TabOrder = 1
+    TabOrder = 0
   end
   object RunBtn: TBitBtn
     AnchorSideLeft.Control = OpenBtn
@@ -146,7 +146,7 @@ object PoCheckerForm: TPoCheckerForm
     Caption = 'Select Basic Tests'
     Enabled = False
     OnClick = SelectBasicTestsBtnClick
-    TabOrder = 3
+    TabOrder = 4
   end
   object SelectAllTestsBtn: TButton
     AnchorSideLeft.Control = SelectBasicTestsBtn
@@ -161,7 +161,7 @@ object PoCheckerForm: TPoCheckerForm
     Caption = 'Select All Tests'
     Enabled = False
     OnClick = SelectAllTestsBtnClick
-    TabOrder = 4
+    TabOrder = 5
   end
   object UnselectAllTestsBtn: TButton
     AnchorSideLeft.Control = SelectAllTestsBtn
@@ -176,7 +176,7 @@ object PoCheckerForm: TPoCheckerForm
     Caption = 'Unselect All Tests'
     Enabled = False
     OnClick = UnselectAllTestsBtnClick
-    TabOrder = 5
+    TabOrder = 6
   end
   object IgnoreFuzzyCheckBox: TCheckBox
     AnchorSideLeft.Control = TestListBox
@@ -188,7 +188,7 @@ object PoCheckerForm: TPoCheckerForm
     Width = 152
     BorderSpacing.Top = 6
     Caption = 'sIgnoreFuzzyTranslations'
-    TabOrder = 6
+    TabOrder = 7
   end
   object StatusBar: TStatusBar
     Left = 0
@@ -248,7 +248,7 @@ object PoCheckerForm: TPoCheckerForm
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
     }
     OnClick = ScanDirBtnClick
-    TabOrder = 8
+    TabOrder = 1
   end
   object MasterPoListBox: TListBox
     AnchorSideTop.Control = IgnoreFuzzyCheckBox
@@ -270,7 +270,7 @@ object PoCheckerForm: TPoCheckerForm
     OnSelectionChange = MasterPoListBoxSelectionChange
     Sorted = True
     Style = lbOwnerDrawFixed
-    TabOrder = 9
+    TabOrder = 8
   end
   object LangFilter: TComboBox
     AnchorSideLeft.Control = MasterPoListBox
@@ -313,7 +313,7 @@ object PoCheckerForm: TPoCheckerForm
     )
     OnChange = LangFilterChange
     Style = csDropDownList
-    TabOrder = 10
+    TabOrder = 9
     Text = 'All languages'
   end
   object ClearMasterFilesBtn: TButton
@@ -330,7 +330,7 @@ object PoCheckerForm: TPoCheckerForm
     BorderSpacing.Top = 10
     Caption = 'Clear'
     OnClick = ClearMasterFilesBtnClick
-    TabOrder = 11
+    TabOrder = 10
   end
   object UnselectAllMasterFilesBtn: TButton
     AnchorSideLeft.Control = SelectAllMasterFilesBtn
@@ -361,7 +361,7 @@ object PoCheckerForm: TPoCheckerForm
     BorderSpacing.Left = 5
     Caption = 'Select all files'
     OnClick = SelectAllMasterFilesBtnClick
-    TabOrder = 13
+    TabOrder = 11
   end
   object OpenDialog: TOpenDialog
     Filter = 'po-files (*.po)|*.po|all files|*'
diff --git a/components/pochecker/resultdlg.lfm b/components/pochecker/resultdlg.lfm
index 2cfafd2790..8406d1cac9 100644
--- a/components/pochecker/resultdlg.lfm
+++ b/components/pochecker/resultdlg.lfm
@@ -3,7 +3,7 @@ object ResultDlgForm: TResultDlgForm
   Height = 635
   Top = 100
   Width = 742
-  ActiveControl = CopyBtn
+  ActiveControl = GraphStatBtn
   Caption = 'Results'
   ClientHeight = 635
   ClientWidth = 742
@@ -34,10 +34,11 @@ object ResultDlgForm: TResultDlgForm
       Anchors = [akRight]
       AutoSize = True
       BorderSpacing.Right = 10
+      Cancel = True
       DefaultCaption = True
       Kind = bkClose
       ModalResult = 11
-      TabOrder = 2
+      TabOrder = 3
     end
     object SaveBtn: TBitBtn
       AnchorSideRight.Control = CloseBtn
@@ -86,7 +87,7 @@ object ResultDlgForm: TResultDlgForm
         39FFBD6E3BFFBB6D3AFFBB6B38EFBB703ECBB6693554FFFFFF00
       }
       OnClick = SaveBtnClick
-      TabOrder = 1
+      TabOrder = 2
     end
     object CopyBtn: TBitBtn
       AnchorSideRight.Control = SaveBtn
@@ -135,7 +136,7 @@ object ResultDlgForm: TResultDlgForm
         FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
       }
       OnClick = CopyBtnClick
-      TabOrder = 0
+      TabOrder = 1
     end
     object GraphStatBtn: TBitBtn
       AnchorSideRight.Control = CopyBtn
@@ -183,7 +184,7 @@ object ResultDlgForm: TResultDlgForm
         5E7D8CA76103E4A6710AFFFFFF00FFFFFF00FFFFFF00FFFFFF00
       }
       OnClick = GraphStatBtnClick
-      TabOrder = 3
+      TabOrder = 0
     end
   end
   inline LogMemo: TSynEdit