diff --git a/dist/OutSystemsUI.d.ts b/dist/OutSystemsUI.d.ts
index f88d34803e..d2ba70d1c1 100644
--- a/dist/OutSystemsUI.d.ts
+++ b/dist/OutSystemsUI.d.ts
@@ -63,7 +63,7 @@ declare namespace OSFramework.OSUI.Constants {
     const EnableLogMessages = false;
     const EmptyString = "";
     const FocusTrapIgnoreAttr = "ignore-focus-trap";
-    const FocusableElems = "a[href]:not([disabled]),[tabindex=\"0\"], button:not([disabled]), textarea:not([disabled]), input[type=\"text\"]:not([disabled]), input[type=\"radio\"]:not([disabled]), input[type=\"checkbox\"]:not([disabled]),input[type=\"submit\"]:not([disabled]), select:not([disabled])";
+    const FocusableElems = "a[href]:not([disabled]),[tabindex=\"0\"], button:not([disabled]), textarea:not([disabled]), input:not([disabled]), select:not([disabled])";
     const JavaScriptTypes: {
         Undefined: string;
         Boolean: string;
diff --git a/dist/OutSystemsUI.js b/dist/OutSystemsUI.js
index ef7adeef4b..8e49bbcf11 100644
--- a/dist/OutSystemsUI.js
+++ b/dist/OutSystemsUI.js
@@ -105,7 +105,7 @@ var OSFramework;
             Constants.EnableLogMessages = false;
             Constants.EmptyString = '';
             Constants.FocusTrapIgnoreAttr = 'ignore-focus-trap';
-            Constants.FocusableElems = 'a[href]:not([disabled]),[tabindex="0"], button:not([disabled]), textarea:not([disabled]), input[type="text"]:not([disabled]), input[type="radio"]:not([disabled]), input[type="checkbox"]:not([disabled]),input[type="submit"]:not([disabled]), select:not([disabled])';
+            Constants.FocusableElems = 'a[href]:not([disabled]),[tabindex="0"], button:not([disabled]), textarea:not([disabled]), input:not([disabled]), select:not([disabled])';
             Constants.JavaScriptTypes = {
                 Undefined: 'undefined',
                 Boolean: 'boolean',
diff --git a/src/scripts/OSFramework/OSUI/Constants.ts b/src/scripts/OSFramework/OSUI/Constants.ts
index 800ec7fdd5..6dd8c0dc5b 100644
--- a/src/scripts/OSFramework/OSUI/Constants.ts
+++ b/src/scripts/OSFramework/OSUI/Constants.ts
@@ -74,7 +74,7 @@ namespace OSFramework.OSUI.Constants {
 
 	/* Store focusable elements when doing a focus trap inside an element*/
 	export const FocusableElems =
-		'a[href]:not([disabled]),[tabindex="0"], button:not([disabled]), textarea:not([disabled]), input[type="text"]:not([disabled]), input[type="radio"]:not([disabled]), input[type="checkbox"]:not([disabled]),input[type="submit"]:not([disabled]), select:not([disabled])';
+		'a[href]:not([disabled]),[tabindex="0"], button:not([disabled]), textarea:not([disabled]), input:not([disabled]), select:not([disabled])';
 
 	/* Store JavaScript types*/
 	export const JavaScriptTypes = {