diff --git a/Build/Notepad3.ini b/Build/Notepad3.ini
index 533f17726..e56fc6207 100644
--- a/Build/Notepad3.ini
+++ b/Build/Notepad3.ini
@@ -55,6 +55,7 @@ SettingsVersion=4
 ;LocaleAnsiCodePageAnalysisBonus=33
 ;LexerSQLNumberSignAsComment=1
 ;ExitOnESCSkipLevel=2
+;ZoomTooltipTimeout=3200
 [Statusbar Settings]
 ;VisibleSections=0 1 12 14 2 4 5 6 7 8 9 10 11
 ;SectionPrefixes=Ln  ,Col  ,Sel  ,Sb  ,SLn  ,Occ  ,,,,,,,Ch  ,Repl  ,Eval  ,
diff --git a/Versions/day.txt b/Versions/day.txt
index 85c3d27e5..4b1e299fb 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-602
+603
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index ee8d81877..cd2581b5e 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.602.1"
+    version="5.20.603.1"
     type="win32"
   />
   <description>Notepad3 BETA</description>
diff --git a/src/Config/Config.cpp b/src/Config/Config.cpp
index 366c90463..dd34de659 100644
--- a/src/Config/Config.cpp
+++ b/src/Config/Config.cpp
@@ -1219,6 +1219,9 @@ void LoadSettings()
     Defaults2.ExitOnESCSkipLevel = 2;
     Settings2.ExitOnESCSkipLevel = clampi(IniSectionGetInt(IniSecSettings2, L"ExitOnESCSkipLevel", Defaults2.ExitOnESCSkipLevel), 0, 2);
 
+    Defaults2.ZoomTooltipTimeout = 3200;
+    Settings2.ZoomTooltipTimeout = clampi(IniSectionGetInt(IniSecSettings2, L"ZoomTooltipTimeout", Defaults2.ZoomTooltipTimeout), 0, 10000);
+
     // --------------------------------------------------------------------------
     // Settings: IniSecSettings
     // --------------------------------------------------------------------------
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 14c11cb45..47f473624 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -10662,19 +10662,22 @@ void SetNotifyIconTitle(HWND hwnd)
 //
 void ShowZoomCallTip()
 {
-  int const iZoomLevelPercent = SciCall_GetZoom();
+  int const delayClr = Settings2.ZoomTooltipTimeout;
+  if (delayClr >= (10*USER_TIMER_MINIMUM)) {
+    int const iZoomLevelPercent = SciCall_GetZoom();
 
-  char chToolTip[32] = { '\0' };
-  StringCchPrintfA(chToolTip, COUNTOF(chToolTip), "Zoom: %i%%", iZoomLevelPercent);
+    char chToolTip[32] = { '\0' };
+    StringCchPrintfA(chToolTip, COUNTOF(chToolTip), "Zoom: %i%%", iZoomLevelPercent);
 
-  DocPos const iPos = SciCall_PositionFromLine(SciCall_GetFirstVisibleLine());
+    DocPos const iPos = SciCall_PositionFromLine(SciCall_GetFirstVisibleLine());
 
-  int const iXOff = SciCall_GetXOffset();
-  SciCall_SetXOffset(0);
-  SciCall_CallTipShow(iPos, chToolTip);
-  SciCall_SetXOffset(iXOff);
-  Globals.CallTipType = CT_ZOOM;
-  _DelayClearZoomCallTip(3200);
+    int const iXOff = SciCall_GetXOffset();
+    SciCall_SetXOffset(0);
+    SciCall_CallTipShow(iPos, chToolTip);
+    SciCall_SetXOffset(iXOff);
+    Globals.CallTipType = CT_ZOOM;
+    _DelayClearZoomCallTip(delayClr);
+  }
 }
 
 
diff --git a/src/TypeDefs.h b/src/TypeDefs.h
index 097f26de0..64531000a 100644
--- a/src/TypeDefs.h
+++ b/src/TypeDefs.h
@@ -530,6 +530,7 @@ typedef struct _settings2_t
   bool   NoCutLineOnEmptySelection;
   bool   LexerSQLNumberSignAsComment;
   int    ExitOnESCSkipLevel;
+  int    ZoomTooltipTimeout;
 
   float  AnalyzeReliableConfidenceLevel;
   float  LocaleAnsiCodePageAnalysisBonus;
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 0530a003f..59630693c 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,7 +8,7 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
-#define VERSION_REV 602
+#define VERSION_REV 603
 #define VERSION_BUILD 1
 #define SCINTILLA_VER 433
 #define ONIGURUMA_REGEX_VER 6.9.5
@@ -16,4 +16,4 @@
 #define TINYEXPR_VER 2018.05.11
 #define UTHASH_VER 2.1.0
 #define VERSION_PATCH BETA
-#define VERSION_COMMIT_ID dkt1-amr
+#define VERSION_COMMIT_ID t7820-rk