diff --git a/src/App.svelte b/src/App.svelte
index eec2a27..ca24c20 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -190,6 +190,8 @@
       overflow-y: auto;
       height: 100%;
       flex-grow: 1;
+      display: flex;
+      flex-direction: column;
     }
   }
 
diff --git a/src/views/TargetManagementView.svelte b/src/views/TargetManagementView.svelte
index 25166db..2a17434 100644
--- a/src/views/TargetManagementView.svelte
+++ b/src/views/TargetManagementView.svelte
@@ -110,17 +110,18 @@
     Warning: This is currently still under development, however it DOES send updates to the real server
   </div>
 
+  <div id="search-wrapper">
+    <label>
+      Search: <input type="search" name="table-search" bind:value={tableSearch} />
+    </label>
+  </div>
+
   <div class="scrolling-area">
     {#await promiseForTable}
       <div class="text-padding">
         <div>Loading...</div>
       </div>
     {:then}
-      <div id="search-wrapper">
-        <label>
-          Search: <input type="search" name="table-search" bind:value={tableSearch} />
-        </label>
-      </div>
       <table class="main-table">
         <thead>
           <tr>