diff --git a/res/icons/tab_next.png b/res/icons/tab_next.png
new file mode 100644
index 00000000..844ce04b
Binary files /dev/null and b/res/icons/tab_next.png differ
diff --git a/res/icons/tab_previous.png b/res/icons/tab_previous.png
new file mode 100644
index 00000000..566e366f
Binary files /dev/null and b/res/icons/tab_previous.png differ
diff --git a/source/main.dfm b/source/main.dfm
index 38f167aa..711f4059 100644
--- a/source/main.dfm
+++ b/source/main.dfm
@@ -1596,6 +1596,12 @@ object MainForm: TMainForm
     object Extra1: TMenuItem
       Tag = 19
       Caption = '&Tools'
+      object Nexttab1: TMenuItem
+        Action = actNextTab
+      end
+      object Previoustab1: TMenuItem
+        Action = actPreviousTab
+      end
       object MenuRefresh1: TMenuItem
         Tag = 28
         Action = actRefresh
@@ -2369,6 +2375,24 @@ object MainForm: TMainForm
       ImageIndex = 115
       OnExecute = actSelectTreeBackgroundExecute
     end
+    object actPreviousTab: TPreviousTab
+      Category = 'Tools'
+      TabControl = PageControlMain
+      Caption = '&Previous tab'
+      Hint = 'Previous tab|Go back to the previous tab'
+      ImageIndex = 117
+      ShortCut = 24585
+      Wrap = True
+    end
+    object actNextTab: TNextTab
+      Category = 'Tools'
+      TabControl = PageControlMain
+      Caption = '&Next tab'
+      Hint = 'Next tab|Go to the next tab'
+      ImageIndex = 116
+      ShortCut = 16393
+      Wrap = True
+    end
   end
   object SaveDialog2: TSaveDialog
     DefaultExt = 'reg'
@@ -5669,6 +5693,52 @@ object MainForm: TMainForm
           0000763095E15A4C85FC0000000049454E44AE426082}
         Name = 'PngImage115'
         Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          610000001974455874536F6674776172650041646F626520496D616765526561
+          647971C9653C000001DC4944415478DADD933D485B5114C7FFEF2516042D55F3
+          A2C1A6689DFCA0092AF50311B4A64307A1202E1D843838B5B45B079D44DC1571
+          9004E9E41C15FC0C0E6A696A5B1191A0A8AD55237946348BC97BF7A3374F5F54
+          A8A074EB8573CF597EBF7B38F75E89738E7F59D27F22F0FBFD2F44DD27A2E68E
+          DC8E880F5EAF37600A36DCEEB2D2FC7CDB855532F6CBFA2A5FD4125435865068
+          755F089CA620DADC5CA71C1EC6A0EBD40064594E43A9B0582C46B65AAD282CCC
+          C3E4E47C420832AF09EA9568F414C9A49E864D2815635B1F114F9EE06DD5281C
+          8E3C8C8FCFDC14B4B43428AA1A171D1003302566F6ADBF83F2C8898D83EF186A
+          0B221098BA29F0781A95582C0E4298017C0ABF073881C644100A474E099E391B
+          10DA0D62FDE02BDA1FF60A4167A6E4F3F9785191132E57457A782941F7442B3C
+          151DA09C81320A068EA3D37DE464D9F1797B0E3F7E2FA1CB3E0043F0B77B5A92
+          06F1CAD5895FC75BD0451784E9D0696A3E0F60CF7E8CC59D69ACFCFC72FB437A
+          3352CA5BDD5D02A420941A9D44CEF6909B55204E5FC66C783AAC1154DE2A783D
+          5C4C139A2666A021417494D8CAE4DAA72FB1B2B78CF9CDD935013F8FF4F3E49D
+          9F7279AFAC563F69B22D6C06BF690CF502D6EEF5178A7B2495328BED9CD10CB5
+          5F5CCFE5FA039136FC0376C1E82D0000000049454E44AE426082}
+        Name = 'PngImage116'
+        Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          610000001874455874536F667477617265005061696E742E4E45542076332E33
+          36A9E7E225000001DE4944415478DA6364A010300E1303E6CE9DEB07A4FA8158
+          89487D2781B83A3939792FCC80C766660632A2A2C240DE7F86FFFF2118046034
+          441CC27AF9F20DC3850BD7AE030DD08219F0DDDBDB99E3E9D3B70C7FFEFC016B
+          FAFBF72FDC2010FEF7EF1F58332B2B3383949430C3BE7DC75F030D10831BE0EB
+          EBC6F1FCF95B86C9671318F8D8851822543BE09A6186810C6167676510131300
+          1A700CD5003F3F0F8EEC354E0C5AD2460CAF3F3C6648D69904D7844CB3B2B230
+          888AF231ECD97304D98039DF577DAAE5D091366530537462B8F4F808C3F3F777
+          19D8589819D898588041CDC210A731016C000B0B1383B0301FC3EEDD87200600
+          35FF9FF92A8FC150D69AC152D985E1FD97570C1202320C4CC008626662666066
+          6462D87D6521438BCF2668804202F3E2C52B0C0F1E3C666054AF67F96FA260CE
+          60A3E4CEF0EAF313A0537F31B032B332B030B132B0026D97175165D876712E83
+          F5FF5CECE940AA8281938D85E19CAB86BB86A1AC15C3BB2F2F1824F9E5C036B3
+          3033030D6266D8746126C3B2B41B58131D5850A282811D68C8296735573D1339
+          2B8613F77631DC7D73ED1F070B2B300CD81838D8D81836643D60C69B948186B0
+          B131311C735073323EF368FF9B6B75FF4549CE0B22150C2C9C4CCCBF9999FEBE
+          79D0C24094010063E4D2BD2D7ABAAB0000000049454E44AE426082}
+        Name = 'PngImage117'
+        Background = clWindow
       end>
     PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
     Left = 104
diff --git a/source/main.pas b/source/main.pas
index be270227..2aa9aeb5 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -22,7 +22,7 @@ uses
   SynCompletionProposal, ZSqlMonitor, SynEditHighlighter, SynHighlighterSQL,
   TntStdCtrls, Tabs, SynUnicode, mysqlconn, EditVar, helpers, queryprogress,
   mysqlquery, createdatabase, createtable, tbl_properties, SynRegExpr,
-  WideStrUtils, ZDbcLogging;
+  WideStrUtils, ZDbcLogging, ExtActns;
 
 type
   TMainForm = class(TForm)
@@ -454,6 +454,10 @@ type
     CopygriddataasSQL1: TMenuItem;
     CopygriddataasSQL2: TMenuItem;
     Selectbackgroundcolor1: TMenuItem;
+    actPreviousTab: TPreviousTab;
+    actNextTab: TNextTab;
+    Nexttab1: TMenuItem;
+    Previoustab1: TMenuItem;
     procedure refreshMonitorConfig;
     procedure loadWindowConfig;
     procedure saveWindowConfig;