diff --git a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html
index 0d860844d..d2f04b986 100644
--- a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html
+++ b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html
@@ -44,6 +44,15 @@ <h3 class="mt-4 mb-2">
       [handleFolderSelection]="handleFolderSelection"
       [rootFolder]="selectedStorageItem()"
     ></osf-google-file-picker>
+    @if (selectedStorageItem() !== null) {
+      <osf-google-file-picker
+        #filePicker
+        [isFolderPicker]="false"
+        [accountId]="accountId()"
+        [currentAddonType]="currentAddonType()"
+        [rootFolder]="selectedStorageItem()"
+      ></osf-google-file-picker>
+    }
   } @else {
     <div class="folders-table flex flex-column">
       <div class="folders-table-heading flex justify-content-between">
diff --git a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts
index b5fb14896..597e887e2 100644
--- a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts
+++ b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts
@@ -10,6 +10,8 @@ import { InputText } from 'primeng/inputtext';
 import { RadioButton } from 'primeng/radiobutton';
 import { Skeleton } from 'primeng/skeleton';
 
+import { timer } from 'rxjs';
+
 import {
   ChangeDetectionStrategy,
   Component,
@@ -22,6 +24,7 @@ import {
   OnInit,
   output,
   signal,
+  viewChild,
 } from '@angular/core';
 import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
 import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -60,6 +63,8 @@ import { ResourceTypeInfoDialogComponent } from '../resource-type-info-dialog/re
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class StorageItemSelectorComponent implements OnInit {
+  addFilesPicker = viewChild<GoogleFilePickerComponent>('filePicker');
+
   private destroyRef = inject(DestroyRef);
   private customDialogService = inject(CustomDialogService);
   private translateService = inject(TranslateService);
@@ -236,6 +241,11 @@ export class StorageItemSelectorComponent implements OnInit {
   handleFolderSelection = (folder: StorageItem): void => {
     this.selectedStorageItem.set(folder);
     this.hasFolderChanged.set(folder?.itemId !== this.initiallySelectedStorageItem()?.itemId);
+    if (this.isGoogleFilePicker()) {
+      timer(1000)
+        .pipe(takeUntilDestroyed(this.destroyRef))
+        .subscribe(() => this.addFilesPicker()?.createPicker());
+    }
   };
 
   private updateBreadcrumbs(