diff --git a/config.def.h b/config.def.h
index d85035f5e2..f4485acabb 100644
--- a/config.def.h
+++ b/config.def.h
@@ -817,7 +817,7 @@ static const unsigned input_poll_type_behavior = 2;
 
 static const unsigned input_bind_timeout = 5;
 
-static const unsigned input_bind_hold = 1;
+static const unsigned input_bind_hold = 2;
 
 static const unsigned menu_thumbnails_default = 3;
 
diff --git a/menu/widgets/menu_input_bind_dialog.c b/menu/widgets/menu_input_bind_dialog.c
index c25898e872..be3a3efb23 100644
--- a/menu/widgets/menu_input_bind_dialog.c
+++ b/menu/widgets/menu_input_bind_dialog.c
@@ -391,6 +391,7 @@ static bool menu_input_key_bind_poll_find_trigger_pad(
    return false;
 }
 
+
 static bool menu_input_key_bind_poll_find_hold_pad(
       struct menu_bind_state *new_state,
      struct retro_keybind * output,
@@ -584,45 +585,46 @@ bool menu_input_key_bind_iterate(menu_input_ctx_bind_t *bind)
       input_driver_keyboard_mapping_set_block( true );
       menu_input_key_bind_poll_bind_state( &binds, menu_bind_port, timed_out );
 
-	    /*keep resetting bind during the hold period, or we'll potentially bind joystick and mouse, etc.*/
-	    binds.buffer = *( binds.output );
+#ifdef ANDROID
 
-      if ( settings->uints.input_bind_timeout == 0 )
+	  /*keep resetting bind during the hold period, or we'll potentially bind joystick and mouse, etc.*/
+	  binds.buffer = *( binds.output );
+
+      if ( menu_input_key_bind_poll_find_hold( &binds, &binds.buffer ) )
       {
-         if ( ( binds.skip && !menu_input_binds.skip ) ||	
-          menu_input_key_bind_poll_find_trigger( &menu_input_binds, &binds, &( binds.buffer ) ) )	
-         {	
-            complete = true;	
+         /*inhibit timeout*/
+         rarch_timer_begin_new_time( &binds.timer_timeout, settings->uints.input_bind_timeout );
+
+         /*run hold timer*/
+         rarch_timer_tick( &binds.timer_hold );
+
+         snprintf( bind->s, bind->len,
+                "[%s]\npress keyboard, mouse or joypad\nand hold ...",
+                input_config_bind_map_get_desc(
+                   menu_input_binds.begin - MENU_SETTINGS_BIND_BEGIN ) );
+
+         /*hold complete?*/
+         if ( rarch_timer_has_expired( &binds.timer_hold ) )
+         {
+            complete = true;
          }
       }
       else
       {
-         if ( menu_input_key_bind_poll_find_hold( &binds, &binds.buffer ) )
-         {
-            /*inhibit timeout*/
-            rarch_timer_begin_new_time( &binds.timer_timeout, settings->uints.input_bind_timeout );
-
-            /*run hold timer*/
-            rarch_timer_tick( &binds.timer_hold );
-
-            snprintf( bind->s, bind->len,
-                   "[%s]\npress keyboard, mouse or joypad\nand hold ...",
-                   input_config_bind_map_get_desc(
-                      menu_input_binds.begin - MENU_SETTINGS_BIND_BEGIN ) );
-
-            /*hold complete?*/
-            if ( rarch_timer_has_expired( &binds.timer_hold ) )
-            {
-               complete = true;
-            }
-         }
-         else
-         {
-            /*reset hold countdown*/
-            rarch_timer_begin_new_time( &binds.timer_hold, settings->uints.input_bind_hold );
-         }
+         /*reset hold countdown*/
+         rarch_timer_begin_new_time( &binds.timer_hold, settings->uints.input_bind_hold );
       }
 
+#else
+
+      if ( ( binds.skip && !menu_input_binds.skip ) ||
+         menu_input_key_bind_poll_find_trigger( &menu_input_binds, &binds, &( binds.buffer ) ) )
+      {
+         complete = true;
+      }
+
+#endif
+
       if ( complete )
       {
          /*update bind*/