diff --git a/uppsrc/CtrlCore/Ctrl.cpp b/uppsrc/CtrlCore/Ctrl.cpp
index 94110b798..c171df486 100644
--- a/uppsrc/CtrlCore/Ctrl.cpp
+++ b/uppsrc/CtrlCore/Ctrl.cpp
@@ -956,6 +956,7 @@ void Ctrl::ChSync()
 CH_INT(GUI_GlobalStyle, GUISTYLE_CLASSIC);
 CH_INT(GUI_DragFullWindow, 1);
 CH_INT(GUI_PopUpEffect, GUIEFFECT_SLIDE);
+CH_INT(GUI_ToolTipDelay, 1000);
 CH_INT(GUI_DropShadows, 1);
 CH_INT(GUI_AltAccessKeys, 1);
 CH_INT(GUI_AKD_Conservative, 0);
diff --git a/uppsrc/CtrlCore/CtrlCore.h b/uppsrc/CtrlCore/CtrlCore.h
index 8e4f0623c..e50aa27d7 100644
--- a/uppsrc/CtrlCore/CtrlCore.h
+++ b/uppsrc/CtrlCore/CtrlCore.h
@@ -1420,6 +1420,8 @@ int GUI_DragFullWindow();
 enum { GUIEFFECT_NONE, GUIEFFECT_SLIDE, GUIEFFECT_FADE };
 int GUI_PopUpEffect();
 
+int GUI_ToolTipDelay();
+
 int GUI_DropShadows();
 int GUI_AltAccessKeys();
 int GUI_AKD_Conservative();
@@ -1429,6 +1431,7 @@ int GUI_DblClickTime();
 void GUI_GlobalStyle_Write(int);
 void GUI_DragFullWindow_Write(int);
 void GUI_PopUpEffect_Write(int);
+void GUI_ToolTipDelay_Write(int);
 void GUI_DropShadows_Write(int);
 void GUI_AltAccessKeys_Write(int);
 void GUI_AKD_Conservative_Write(int);
diff --git a/uppsrc/CtrlLib/ToolTip.cpp b/uppsrc/CtrlLib/ToolTip.cpp
index b9769b1ee..8910a1307 100644
--- a/uppsrc/CtrlLib/ToolTip.cpp
+++ b/uppsrc/CtrlLib/ToolTip.cpp
@@ -97,7 +97,7 @@ void SyncToolTip(Ctrl *ctrl)
 			ShowToolTip();
 		else {
 			LLOG("ToolTipHook -> SetTimeCallback");
-			SetTimeCallback(1000, callback(ShowToolTip), (void *)SyncToolTip);
+			SetTimeCallback(GUI_ToolTipDelay(), callback(ShowToolTip), (void *)SyncToolTip);
 		}
 	}
 }