diff --git a/resources/views/components/tax-dropdown.blade.php b/resources/views/components/tax-dropdown.blade.php
index 13bff44..6656d57 100644
--- a/resources/views/components/tax-dropdown.blade.php
+++ b/resources/views/components/tax-dropdown.blade.php
@@ -1,13 +1,12 @@
-<div x-data="{ selectedOption: {{ $standard }}, tax_rates: {{ $tax_rates }} }">
-    <div class="w-80 flex pr-3">
-        <x-input-label for="tax_rate" :value="__('configuration.Taxrate')"/>
+<div x-data="{ tax_rates: {{ $tax_rates }} }">
+    <div class="flex flex-col">
+        <x-input-label for="{{ $name }}" :value="__('configuration.Taxrate')"/>
         <div class="inline-block relative ">
-            <select name="tax_rate" x-model="selectedOption"
-                    class="border-gray-300 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300 focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 rounded-md shadow-sm"
-                    x-on:change="console.log(selectedOption);" x-init="console.log(selectedOption);">
+            <select name="{{ $name }}" x-model="{{ $xmodel }}"
+                    class="border-gray-300 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300 focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 rounded-md shadow-sm">
                 <template x-for="tax_rate in tax_rates" :key="tax_rate.id">
-                    <option :value="tax_rate.rate" x-text="tax_rate.rate_percentage"
-                            :selected="tax_rate.active"></option>
+                    <option x-bind:value="tax_rate.rate" x-text="tax_rate.rate_percentage"
+                            :selected="{{ $xmodel }}"></option>
                 </template>
             </select>
         </div>