diff --git a/app/Http/Controllers/Modals/Categories.php b/app/Http/Controllers/Modals/Categories.php
index 5fd1891df..8765fd3a0 100644
--- a/app/Http/Controllers/Modals/Categories.php
+++ b/app/Http/Controllers/Modals/Categories.php
@@ -30,7 +30,13 @@ class Categories extends Controller
     {
         $type = $request['type'];
 
-        $html = view('modals.categories.create', compact('currencies', 'type'))->render();
+        $category_selector = false;
+
+        if (request()->has('category_selector')) {
+            $category_selector = request()->get('category_selector');
+        }
+
+        $html = view('modals.categories.create', compact('currencies', 'type', 'category_selector'))->render();
 
         return response()->json([
             'success' => true,
@@ -49,6 +55,8 @@ class Categories extends Controller
      */
     public function store(Request $request)
     {
+        $request['enabled'] = 1;
+
         $category = Category::create($request->all());
 
         $message = trans('messages.success.added', ['type' => trans_choice('general.categories', 1)]);
diff --git a/app/Http/Controllers/Modals/Customers.php b/app/Http/Controllers/Modals/Customers.php
index b0af0b62c..d95e49f8d 100644
--- a/app/Http/Controllers/Modals/Customers.php
+++ b/app/Http/Controllers/Modals/Customers.php
@@ -40,7 +40,13 @@ class Customers extends Controller
     {
         $currencies = Currency::enabled()->pluck('name', 'code');
 
-        $html = view('modals.customers.create', compact('currencies'))->render();
+        $customer_selector = false;
+
+        if (request()->has('customer_selector')) {
+            $customer_selector = request()->get('customer_selector');
+        }
+
+        $html = view('modals.customers.create', compact('currencies', 'customer_selector'))->render();
 
         return response()->json([
             'success' => true,
@@ -59,6 +65,8 @@ class Customers extends Controller
      */
     public function store(Request $request)
     {
+        $request['enabled'] = 1;
+
         $customer = Customer::create($request->all());
 
         $message = trans('messages.success.added', ['type' => trans_choice('general.customers', 1)]);
diff --git a/app/Http/Controllers/Modals/Vendors.php b/app/Http/Controllers/Modals/Vendors.php
index ccafd2877..87ffd5f17 100644
--- a/app/Http/Controllers/Modals/Vendors.php
+++ b/app/Http/Controllers/Modals/Vendors.php
@@ -41,7 +41,13 @@ class Vendors extends Controller
     {
         $currencies = Currency::enabled()->pluck('name', 'code');
 
-        $html = view('modals.vendors.create', compact('currencies'))->render();
+        $vendor_selector = false;
+
+        if (request()->has('vendor_selector')) {
+            $vendor_selector = request()->get('vendor_selector');
+        }
+
+        $html = view('modals.vendors.create', compact('currencies', 'vendor_selector'))->render();
 
         return response()->json([
             'success' => true,
@@ -60,6 +66,8 @@ class Vendors extends Controller
      */
     public function store(Request $request)
     {
+        $request['enabled'] = 1;
+
         $vendor = Vendor::create($request->all());
 
         // Upload logo
diff --git a/resources/views/modals/categories/create.blade.php b/resources/views/modals/categories/create.blade.php
index cf648b32a..235c894c2 100644
--- a/resources/views/modals/categories/create.blade.php
+++ b/resources/views/modals/categories/create.blade.php
@@ -66,8 +66,15 @@
 
                 $('#modal-create-category').modal('hide');
 
-                $("#category_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
-                $("#category_id").select2('refresh');
+                $('#category_id').append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
+                $('#category_id').trigger('change');
+                $('#category_id').select2('refresh');
+
+                @if ($category_selector)
+                $('{{ $category_selector }}').append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
+                $('{{ $category_selector }}').trigger('change');
+                $('{{ $category_selector }}').select2('refresh');
+                @endif
             },
             error: function(error, textStatus, errorThrown) {
                 $('#span-loading').remove();
diff --git a/resources/views/modals/customers/create.blade.php b/resources/views/modals/customers/create.blade.php
index 7779caf83..b11360559 100644
--- a/resources/views/modals/customers/create.blade.php
+++ b/resources/views/modals/customers/create.blade.php
@@ -64,9 +64,15 @@
 
                 $('#modal-create-customer').modal('hide');
 
-                $("#customer_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
+                $('#customer_id').append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
                 $('#customer_id').trigger('change');
-                $("#customer_id").select2('refresh');
+                $('#customer_id').select2('refresh');
+
+                @if ($customer_selector)
+                $('{{ $customer_selector }}').append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
+                $('{{ $customer_selector }}').trigger('change');
+                $('{{ $customer_selector }}').select2('refresh');
+                @endif
             },
             error: function(error, textStatus, errorThrown) {
                 $('#span-loading').remove();
diff --git a/resources/views/modals/taxes/create.blade.php b/resources/views/modals/taxes/create.blade.php
index 5c6b1f095..a65c77951 100644
--- a/resources/views/modals/taxes/create.blade.php
+++ b/resources/views/modals/taxes/create.blade.php
@@ -62,14 +62,14 @@
 
                 $('#modal-create-tax').modal('hide');
 
-                $("#tax_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
+                $('#tax_id').append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
                 $('#tax_id').trigger('change');
-                $("#tax_id").select2('refresh');
+                $('#tax_id').select2('refresh');
 
                 @if ($tax_selector)
-                $("{{ $tax_selector }}").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
+                $('{{ $tax_selector }}').append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
                 $('{{ $tax_selector }}').trigger('change');
-                $("{{ $tax_selector }}").select2('refresh');
+                $('{{ $tax_selector }}').select2('refresh');
                 @endif
             },
             error: function(error, textStatus, errorThrown) {
diff --git a/resources/views/modals/vendors/create.blade.php b/resources/views/modals/vendors/create.blade.php
index cbf8df86b..38f5cc799 100644
--- a/resources/views/modals/vendors/create.blade.php
+++ b/resources/views/modals/vendors/create.blade.php
@@ -64,9 +64,15 @@
 
                 $('#modal-create-vendor').modal('hide');
 
-                $("#vendor_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
+                $('#vendor_id').append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
                 $('#vendor_id').trigger('change');
-                $("#vendor_id").select2('refresh');
+                $('#vendor_id').select2('refresh');
+
+                @if ($vendor_selector)
+                $('{{ $vendor_selector }}').append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
+                $('{{ $vendor_selector }}').trigger('change');
+                $('{{ $vendor_selector }}').select2('refresh');
+                @endif
             },
             error: function(error, textStatus, errorThrown) {
                 $('#span-loading').remove();