diff --git a/guacamole/src/main/webapp/scripts/client-ui.js b/guacamole/src/main/webapp/scripts/client-ui.js
index 71a6d4b62..3e7eacb77 100644
--- a/guacamole/src/main/webapp/scripts/client-ui.js
+++ b/guacamole/src/main/webapp/scripts/client-ui.js
@@ -2192,6 +2192,7 @@ GuacUI.Client.attach = function(guac) {
 
     GuacUI.Client.text_input.target.onfocus = function() {
         GuacUI.Client.text_input.enabled = true;
+        reset_text_input_target(GuacUI.Client.TEXT_INPUT_PADDING);
     };
 
     GuacUI.Client.text_input.target.onblur = function() {