diff --git a/app/edge/EdgeDevices/WaitingRoomView/Datatable/Datatable.tsx b/app/edge/EdgeDevices/WaitingRoomView/Datatable/Datatable.tsx
index a1c17823b..1dea9fd06 100644
--- a/app/edge/EdgeDevices/WaitingRoomView/Datatable/Datatable.tsx
+++ b/app/edge/EdgeDevices/WaitingRoomView/Datatable/Datatable.tsx
@@ -109,19 +109,22 @@ export function DataTable({
     <div className="row">
       <div className="col-sm-12">
         <Table.Container>
-          <Table.Title label="Edge Devices Waiting Room" icon="" />
-          <Table.Actions>
-            <Button
-              onClick={() =>
-                handleAssociateDevice(selectedFlatRows.map((r) => r.original))
-              }
-              disabled={selectedFlatRows.length === 0}
-            >
-              Associate Device
-            </Button>
-          </Table.Actions>
-
-          <SearchBar onChange={handleSearchBarChange} value={searchBarValue} />
+          <Table.Title label="Edge Devices Waiting Room" icon="">
+            <SearchBar
+              onChange={handleSearchBarChange}
+              value={searchBarValue}
+            />
+            <Table.Actions>
+              <Button
+                onClick={() =>
+                  handleAssociateDevice(selectedFlatRows.map((r) => r.original))
+                }
+                disabled={selectedFlatRows.length === 0}
+              >
+                Associate Device
+              </Button>
+            </Table.Actions>
+          </Table.Title>
 
           <Table
             className={tableProps.className}