diff --git a/browser/src/control/Control.UIManager.js b/browser/src/control/Control.UIManager.js
index cd4f9510d892..9e637e9b94e4 100644
--- a/browser/src/control/Control.UIManager.js
+++ b/browser/src/control/Control.UIManager.js
@@ -1570,6 +1570,9 @@ L.Control.UIManager = L.Control.extend({
 				that.closeModal(dialogId);
 			}}
 		]);
+
+		// focus on input modal on show
+		document.getElementById('input-modal-input').focus();
 	},
 
 	/// Shows an info bar at the bottom right of the view.