diff --git a/client/core/src/components/popover/popover.js b/client/core/src/components/popover/popover.js
index afc1f7c4e3..bfdaaaed66 100644
--- a/client/core/src/components/popover/popover.js
+++ b/client/core/src/components/popover/popover.js
@@ -75,6 +75,15 @@ export default class Popover extends Component {
 
         this.document.addEventListener('keydown', this.docKeyDownHandler);
         this.document.addEventListener('focusin', this.docFocusInHandler);
+        let firstFocusable = this.element.querySelector('input, textarea');
+        if (firstFocusable) {
+            firstFocusable.addEventListener('focus', () => {
+                firstFocusable.select();
+            });
+            setTimeout(() => {
+                firstFocusable.focus();
+            }, 200);
+        }
 
         this.deregisterCallback = this.$transitions.onStart({}, () => this.hide());
         this.relocate();