diff --git a/frontend/editor/src/core/components/shared/tooltip/Tooltip.module.css b/frontend/editor/src/core/components/shared/tooltip/Tooltip.module.css
index 09c5520d7..e2b5ecca1 100644
--- a/frontend/editor/src/core/components/shared/tooltip/Tooltip.module.css
+++ b/frontend/editor/src/core/components/shared/tooltip/Tooltip.module.css
@@ -10,7 +10,6 @@
   font-size: 0.875rem;
   line-height: 1.5;
   pointer-events: auto;
-  z-index: 9999;
   transition:
     opacity 100ms ease-out,
     transform 100ms ease-out;
diff --git a/frontend/editor/src/core/services/googleDrivePickerService.ts b/frontend/editor/src/core/services/googleDrivePickerService.ts
index c4545d549..ac4dbd116 100644
--- a/frontend/editor/src/core/services/googleDrivePickerService.ts
+++ b/frontend/editor/src/core/services/googleDrivePickerService.ts
@@ -4,6 +4,7 @@
  */
 
 import { loadScript } from "@app/utils/scriptLoader";
+import { Z_INDEX_OVER_FILE_MANAGER_MODAL } from "@app/styles/zIndex";
 
 const SCOPES = "https://www.googleapis.com/auth/drive.readonly";
 const SESSION_STORAGE_ID = "googleDrivePickerAccessToken";
@@ -202,6 +203,10 @@ class GoogleDrivePickerService {
         .addView(view2)
         .setCallback((data: any) => this.pickerCallback(data, resolve, reject));
 
+      (builder as unknown as { setZIndex(z: number): void }).setZIndex(
+        Z_INDEX_OVER_FILE_MANAGER_MODAL,
+      );
+
       if (options.multiple) {
         builder.enableFeature(window.google.picker.Feature.MULTISELECT_ENABLED);
       }
diff --git a/frontend/editor/src/core/styles/zIndex.ts b/frontend/editor/src/core/styles/zIndex.ts
index d58b8503c..be83afebe 100644
--- a/frontend/editor/src/core/styles/zIndex.ts
+++ b/frontend/editor/src/core/styles/zIndex.ts
@@ -12,7 +12,7 @@ export const Z_INDEX_OVER_FILE_MANAGER_MODAL = 1300;
 
 export const Z_INDEX_AUTOMATE_MODAL = 1100;
 // Dropdowns/Popovers inside automation modals need to be above the modal
-export const Z_INDEX_AUTOMATE_DROPDOWN = 1200;
+export const Z_INDEX_AUTOMATE_DROPDOWN = 1150;
 
 // page editor Zindexes
 export const Z_INDEX_HOVER_ACTION_MENU = 100;