diff --git a/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.html b/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.html
index 5fb0ea732..3107fc072 100644
--- a/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.html
+++ b/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.html
@@ -17,12 +17,8 @@
             {{formControl.value | defaultValue}}
           </ng-template>
           <ng-template #edit>
-            <div class="input-group">
-              <input id="settings-hostname" aria-describedby="hostname-validations" class="form-control" formControlName="hostName" type="text"
-                     [class.is-invalid]="formControl.invalid && !formControl.untouched" appEnterBlur>
-              <button type="button" class="btn btn-outline-secondary" (click)="autofillGmail()">{{t('gmail-label')}}</button>
-              <button type="button" class="btn btn-outline-secondary" (click)="autofillOutlook()">{{t('outlook-label')}}</button>
-            </div>
+            <input id="settings-hostname" aria-describedby="hostname-validations" class="form-control" formControlName="hostName" type="text"
+                   [class.is-invalid]="formControl.invalid && !formControl.untouched" appEnterBlur>
 
             @if (formControl.errors; as errors) {
               <div id="hostname-validations" class="invalid-feedback" style="display: inline-block">
@@ -69,7 +65,11 @@
             {{formControl.value | defaultValue}}
           </ng-template>
           <ng-template #edit>
-            <input type="text" class="form-control" formControlName="host" id="settings-host" appEnterBlur />
+            <div class="input-group">
+              <input type="text" class="form-control" formControlName="host" id="settings-host" appEnterBlur />
+              <button type="button" class="btn btn-outline-secondary" (click)="autofillGmail()">{{t('gmail-label')}}</button>
+              <button type="button" class="btn btn-outline-secondary" (click)="autofillOutlook()">{{t('outlook-label')}}</button>
+            </div>
           </ng-template>
         </app-setting-item>
       }
diff --git a/UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.ts b/UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.ts
index 351042725..40f24acb9 100644
--- a/UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.ts
+++ b/UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.ts
@@ -239,6 +239,11 @@ export class SideNavComponent implements OnInit {
   }
 
   async reorderDrop($event: CdkDragDrop<any, any, SideNavStream>) {
+    // Don't allow dropping on non SideNav items
+    if ($event.currentIndex < 3) {
+      return;
+    }
+
     const stream = $event.item.data;
     // Offset the home, back, and customize button
     this.navService.updateSideNavStreamPosition(stream.name, stream.id, stream.order, $event.currentIndex - 3).subscribe({