diff --git a/dashboard/src/features/entity-table/components/table-filtering.tsx b/dashboard/src/features/entity-table/components/table-filtering.tsx
index 4553efb..0011c69 100644
--- a/dashboard/src/features/entity-table/components/table-filtering.tsx
+++ b/dashboard/src/features/entity-table/components/table-filtering.tsx
@@ -16,7 +16,7 @@ export const TableFiltering: FC<TableFilteringProps> = () => {
             placeholder={t('table.filter-placeholder', { name: filtering.column })}
             value={filtering.columnFilters}
             onChange={(e) => filtering.setColumnFilters(e.target.value)}
-            className="max-w-sm w-[8rem] md:w-[20rem]"
+            className=" w-full md:w-[20rem]"
         />
     );
 }
diff --git a/dashboard/src/features/entity-table/entity-table.tsx b/dashboard/src/features/entity-table/entity-table.tsx
index 9b03847..48a15bc 100644
--- a/dashboard/src/features/entity-table/entity-table.tsx
+++ b/dashboard/src/features/entity-table/entity-table.tsx
@@ -88,14 +88,16 @@ export function EntityTable<T>({
     return (
         <EntityTableContext.Provider value={contextValue}>
             <div className="flex flex-col">
-                <div className="flex items-center py-4">
+                <div className="flex flex-col md:flex-row-reverse items-center py-4 gap-2 w-full">
+                    <div className="flex flex-row items-center w-full">
+                        <DataTableViewOptions table={table} />
+                        {onCreate && (
+                            <Button aria-label={`create-${entityKey}`} onClick={onCreate}>
+                                {t("create")}
+                            </Button>
+                        )}
+                    </div>
                     <TableFiltering />
-                    <DataTableViewOptions table={table} />
-                    {onCreate && (
-                        <Button aria-label={`create-${entityKey}`} onClick={onCreate}>
-                            {t("create")}
-                        </Button>
-                    )}
                 </div>
                 <div className="w-full rounded-md border">
                     <EntityDataTable columns={columns} onRowClick={onOpen} />