diff --git a/packages/builder/src/components/common/HelpIcon.svelte b/packages/builder/src/components/common/HelpIcon.svelte
index bb3256792e..50434b7b16 100644
--- a/packages/builder/src/components/common/HelpIcon.svelte
+++ b/packages/builder/src/components/common/HelpIcon.svelte
@@ -31,6 +31,7 @@
     bottom: var(--spacing-m);
     right: var(--spacing-m);
     border-radius: 55%;
+    z-index: 99999;
   }
   .hidden {
     display: none;
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 8efa4b7271..f073693a49 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -346,6 +346,10 @@
     justify-content: flex-start;
     align-items: center;
     gap: var(--spacing-xl);
+    flex-wrap: wrap;
+  }
+  .app-actions :global(.spectrum-Textfield) {
+    max-width: 180px;
   }
 
   .app-table {
@@ -380,6 +384,9 @@
       margin-top: var(--spacing-xl);
       margin-bottom: calc(-1 * var(--spacing-m));
     }
+    .app-actions :global(.spectrum-Textfield) {
+      max-width: none;
+    }
     /*  Hide download apps icon */
     .app-actions :global(> .spectrum-Icon) {
       display: none;