diff --git a/data/org.fedorahosted.eekboard.gschema.xml.in b/data/org.fedorahosted.eekboard.gschema.xml.in
index df6a6c2b..fdfb3ca0 100644
--- a/data/org.fedorahosted.eekboard.gschema.xml.in
+++ b/data/org.fedorahosted.eekboard.gschema.xml.in
@@ -16,10 +16,10 @@
       <summary>Hide keyboard automatically when focus is out</summary>
       <description>If true, hide keyboard automatically when focus is out.</description>
     </key>
-    <key name="auto-hide-delay" type="d">
-      <default>0.5</default>
-      <summary>Delay seconds before hiding keyboard</summary>
-      <description>Delay seconds before hiding keyboard.  This is useful when focus listener is enabled.</description>
+    <key name="auto-hide-delay" type="i">
+      <default>500</default>
+      <summary>Delay before hiding keyboard</summary>
+      <description>Delay before hiding keyboard in milliseconds.  This is useful when focus listener is enabled.</description>
     </key>
     <key type="b" name="repeat">
       <default>true</default>
@@ -27,12 +27,12 @@
       <description>Generate key-press/release event repeatedly while a key is held down</description>
     </key>
     <key type="i" name="repeat-interval">
-      <default>30</default>
+      <default>100</default>
       <summary>Key repeat interval</summary>
       <description>Delay between repeats in milliseconds.</description>
     </key>
     <key type="i" name="repeat-delay">
-      <default>500</default>
+      <default>1000</default>
       <summary>Initial key repeat delay</summary>
       <description>Initial key repeat delay in milliseconds.</description>
     </key>
diff --git a/src/client.c b/src/client.c
index a34a7b2c..6b1dd7af 100644
--- a/src/client.c
+++ b/src/client.c
@@ -623,10 +623,10 @@ focus_message_filter (GDBusConnection *connection,
             eekboard_context_show_keyboard (client->context, NULL);
         } else if (g_settings_get_boolean (client->settings, "auto-hide") &&
                    g_strcmp0 (member, "FocusOut") == 0) {
-            gdouble delay = g_settings_get_double (client->settings,
-                                                   "auto-hide-delay");
+            gint delay = g_settings_get_int (client->settings,
+                                             "auto-hide-delay");
             client->hide_keyboard_timeout_id =
-                g_timeout_add ((guint)(delay * 1000),
+                g_timeout_add (delay,
                                (GSourceFunc)on_hide_keyboard_timeout,
                                client);
         }