diff --git a/components/combobox/demo/api.min.js b/components/combobox/demo/api.min.js
index ec13131..8eeca90 100644
--- a/components/combobox/demo/api.min.js
+++ b/components/combobox/demo/api.min.js
@@ -2397,6 +2397,7 @@ class AuroFloatingUI {
           this.handleFocusLoss();
           break;
         case 'click':
+          event.currentTarget.focus();
           this.handleClick();
           break;
           // Do nothing
diff --git a/components/combobox/demo/index.min.js b/components/combobox/demo/index.min.js
index ce6b992..41ae439 100644
--- a/components/combobox/demo/index.min.js
+++ b/components/combobox/demo/index.min.js
@@ -2301,6 +2301,7 @@ class AuroFloatingUI {
           this.handleFocusLoss();
           break;
         case 'click':
+          event.currentTarget.focus();
           this.handleClick();
           break;
           // Do nothing
diff --git a/components/datepicker/demo/api.min.js b/components/datepicker/demo/api.min.js
index c45f31f..1bdaa2f 100644
--- a/components/datepicker/demo/api.min.js
+++ b/components/datepicker/demo/api.min.js
@@ -12576,6 +12576,7 @@ class AuroFloatingUI {
           this.handleFocusLoss();
           break;
         case 'click':
+          event.currentTarget.focus();
           this.handleClick();
           break;
           // Do nothing
diff --git a/components/datepicker/demo/index.min.js b/components/datepicker/demo/index.min.js
index 1540a17..f9944ef 100644
--- a/components/datepicker/demo/index.min.js
+++ b/components/datepicker/demo/index.min.js
@@ -12324,6 +12324,7 @@ class AuroFloatingUI {
           this.handleFocusLoss();
           break;
         case 'click':
+          event.currentTarget.focus();
           this.handleClick();
           break;
           // Do nothing
diff --git a/components/dropdown/demo/api.min.js b/components/dropdown/demo/api.min.js
index 3bf2879..277418a 100644
--- a/components/dropdown/demo/api.min.js
+++ b/components/dropdown/demo/api.min.js
@@ -1925,6 +1925,7 @@ class AuroFloatingUI {
           this.handleFocusLoss();
           break;
         case 'click':
+          event.currentTarget.focus();
           this.handleClick();
           break;
           // Do nothing
diff --git a/components/dropdown/demo/index.min.js b/components/dropdown/demo/index.min.js
index 8ed7c09..7b5e817 100644
--- a/components/dropdown/demo/index.min.js
+++ b/components/dropdown/demo/index.min.js
@@ -1900,6 +1900,7 @@ class AuroFloatingUI {
           this.handleFocusLoss();
           break;
         case 'click':
+          event.currentTarget.focus();
           this.handleClick();
           break;
           // Do nothing
diff --git a/components/dropdown/src/floatingUI.mjs b/components/dropdown/src/floatingUI.mjs
index 40197d7..2a3e20a 100644
--- a/components/dropdown/src/floatingUI.mjs
+++ b/components/dropdown/src/floatingUI.mjs
@@ -307,6 +307,7 @@ export default class AuroFloatingUI {
           this.handleFocusLoss();
           break;
         case 'click':
+          event.currentTarget.focus();
           this.handleClick();
           break;
         default:
diff --git a/components/select/demo/api.min.js b/components/select/demo/api.min.js
index 39b1b21..425c779 100644
--- a/components/select/demo/api.min.js
+++ b/components/select/demo/api.min.js
@@ -2337,6 +2337,7 @@ class AuroFloatingUI {
           this.handleFocusLoss();
           break;
         case 'click':
+          event.currentTarget.focus();
           this.handleClick();
           break;
           // Do nothing
diff --git a/components/select/demo/index.min.js b/components/select/demo/index.min.js
index e6e9c25..92613cd 100644
--- a/components/select/demo/index.min.js
+++ b/components/select/demo/index.min.js
@@ -2278,6 +2278,7 @@ class AuroFloatingUI {
           this.handleFocusLoss();
           break;
         case 'click':
+          event.currentTarget.focus();
           this.handleClick();
           break;
           // Do nothing