diff --git a/src/Mod/Draft/draftguitools/gui_hatch.py b/src/Mod/Draft/draftguitools/gui_hatch.py
index 995a262d66..85e6716ada 100644
--- a/src/Mod/Draft/draftguitools/gui_hatch.py
+++ b/src/Mod/Draft/draftguitools/gui_hatch.py
@@ -27,6 +27,7 @@ import os
 import FreeCAD
 from draftguitools import gui_base
 from draftutils import params
+from draftutils.todo import todo
 from draftutils.translate import QT_TRANSLATE_NOOP, translate
 
 
@@ -69,6 +70,7 @@ class Draft_Hatch_TaskPanel:
             self.form.Pattern.setCurrentText(pat)
         self.form.Scale.setValue(params.get_param("HatchPatternScale"))
         self.form.Rotation.setValue(params.get_param("HatchPatternRotation"))
+        todo.delay(self.form.setFocus, None)  # Make sure using Esc works.
 
     def accept(self):