diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
index 656c5f2ac1..373dfbcba7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
@@ -15,42 +15,40 @@
 
                 <div on-drag-leave="vm.dragLeave()" on-drag-end="vm.dragLeave()" on-drag-enter="vm.dragEnter()">
 
-                    <div class="umb-control-group umb-mediapicker-upload">
+                    <div class="umb-control-group">
 
-                        <umb-load-indicator
-                            ng-if="vm.loading">
-                        </umb-load-indicator>
+                        <div class="umb-mediapicker-upload">
+                            <div class="form-search">
+                                <i class="icon-search" aria-hidden="true"></i>
+                                <input class="umb-search-field search-query -full-width-input"
+                                    ng-model="vm.searchOptions.filter"
+                                    localize="placeholder"
+                                    placeholder="@placeholders_search"
+                                    ng-change="vm.changeSearch()"
+                                    type="text"
+                                    umb-auto-focus
+                                    no-dirty-check
+                                    />
 
-                        <div class="form-search">
-                            <i class="icon-search" aria-hidden="true"></i>
-                            <input class="umb-search-field search-query -full-width-input"
-                                   ng-model="vm.searchOptions.filter"
-                                   localize="placeholder"
-                                   placeholder="@placeholders_search"
-                                   ng-change="vm.changeSearch()"
-                                   type="text"
-                                   umb-auto-focus
-                                   no-dirty-check
-                                   />
-
-                            <div class="form-search__toggle">
-                                <umb-checkbox
-                                    model="showChilds"
-                                    on-change="vm.toggle()"
-                                    text="Include subfolders in search"
-                                    label-key="general_includeFromsubFolders">
-                                </umb-checkbox>
+                                <div class="form-search__toggle">
+                                    <umb-checkbox
+                                        model="showChilds"
+                                        on-change="vm.toggle()"
+                                        text="Include subfolders in search"
+                                        label-key="general_includeFromsubFolders">
+                                    </umb-checkbox>
+                                </div>
                             </div>
-                        </div>
 
-                        <div class="upload-button">
-                            <umb-button
-                                type="button"
-                                label-key="general_upload"
-                                action="vm.upload()"
-                                disabled="lockedFolder"
-                                button-style="action">
-                            </umb-button>
+                            <div class="upload-button">
+                                <umb-button
+                                    type="button"
+                                    label-key="general_upload"
+                                    action="vm.upload()"
+                                    disabled="lockedFolder"
+                                    button-style="action">
+                                </umb-button>
+                            </div>
                         </div>
 
                     </div>
@@ -120,6 +118,11 @@
                             current-folder-id="{{currentFolder.id}}">
                     </umb-media-grid>
 
+
+                    <umb-load-indicator
+                        ng-if="vm.loading">
+                    </umb-load-indicator>
+
                     <div class="flex justify-center">
                         <umb-pagination
                             ng-if="vm.searchOptions.totalPages > 0 && !vm.loading"
@@ -136,7 +139,7 @@
                 </div>
 
                 <umb-overlay ng-if="vm.mediaPickerDetailsOverlay.show" model="vm.mediaPickerDetailsOverlay" position="right">
-                
+
                 <div class="umb-control-group" ng-if="!target.id">
                     <h5>
                         <localize key="@general_url"></localize>