diff --git a/src/zenity.ui b/src/zenity.ui
index db30432..5275a07 100644
--- a/src/zenity.ui
+++ b/src/zenity.ui
@@ -7,7 +7,7 @@
     <property name="title" translatable="yes">Calendar selection</property>
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
-    <property name="focus_on_map">False</property>
+    <property name="focus_on_map">True</property>
     <property name="has_separator">False</property>
     <signal name="destroy" handler="gtk_main_quit"/>
     <child internal-child="vbox">
@@ -129,7 +129,7 @@
     <property name="title" translatable="yes">Warning</property>
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
-    <property name="focus_on_map">False</property>
+    <property name="focus_on_map">True</property>
     <property name="has_separator">False</property>
     <signal name="destroy" handler="gtk_main_quit"/>
     <child internal-child="vbox">
@@ -213,7 +213,7 @@
     <property name="title" translatable="yes">Question</property>
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
-    <property name="focus_on_map">False</property>
+    <property name="focus_on_map">True</property>
     <property name="has_separator">False</property>
     <signal name="destroy" handler="gtk_main_quit"/>
     <child internal-child="vbox">
@@ -278,7 +278,7 @@
     <property name="title" translatable="yes">Add a new entry</property>
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
-    <property name="focus_on_map">False</property>
+    <property name="focus_on_map">True</property>
     <property name="has_separator">False</property>
     <signal name="destroy" handler="gtk_main_quit"/>
     <child internal-child="vbox">
@@ -377,7 +377,7 @@
     <property name="default_width">300</property>
     <property name="default_height">200</property>
     <property name="type_hint">dialog</property>
-    <property name="focus_on_map">False</property>
+    <property name="focus_on_map">True</property>
     <property name="has_separator">False</property>
     <signal name="destroy" handler="gtk_main_quit"/>
     <child internal-child="vbox">
@@ -455,7 +455,7 @@
     <property name="title" translatable="yes">Progress</property>
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
-    <property name="focus_on_map">False</property>
+    <property name="focus_on_map">True</property>
     <property name="has_separator">False</property>
     <signal name="destroy" handler="gtk_main_quit"/>
     <child internal-child="vbox">
@@ -551,7 +551,7 @@
     <property name="title" translatable="yes">Error</property>
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
-    <property name="focus_on_map">False</property>
+    <property name="focus_on_map">True</property>
     <property name="has_separator">False</property>
     <signal name="destroy" handler="gtk_main_quit"/>
     <child internal-child="vbox">
@@ -643,7 +643,7 @@
     <property name="default_width">300</property>
     <property name="default_height">196</property>
     <property name="type_hint">dialog</property>
-    <property name="focus_on_map">False</property>
+    <property name="focus_on_map">True</property>
     <property name="has_separator">False</property>
     <signal name="destroy" handler="gtk_main_quit"/>
     <child internal-child="vbox">
@@ -744,7 +744,7 @@
     <property name="title" translatable="yes">Information</property>
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
-    <property name="focus_on_map">False</property>
+    <property name="focus_on_map">True</property>
     <property name="has_separator">False</property>
     <signal name="destroy" handler="gtk_main_quit"/>
     <child internal-child="vbox">
@@ -827,7 +827,7 @@
     <property name="default_width">300</property>
     <property name="default_height">100</property>
     <property name="type_hint">dialog</property>
-    <property name="focus_on_map">False</property>
+    <property name="focus_on_map">True</property>
     <property name="has_separator">False</property>
     <signal name="destroy" handler="gtk_main_quit"/>
     <child internal-child="vbox">