diff --git a/app/Traits/Currencies.php b/app/Traits/Currencies.php
index cfdb785d8..6e8bbe69b 100644
--- a/app/Traits/Currencies.php
+++ b/app/Traits/Currencies.php
@@ -62,21 +62,21 @@ trait Currencies
 
     public function getConvertedAmount($format = false, $with_tax = true)
     {
-        $amount = $with_tax ? $this->amount : isset($this->amount_without_tax) ? $this->amount_without_tax : $this->amount;
+        $amount = $with_tax ? $this->amount : (isset($this->amount_without_tax) ? $this->amount_without_tax : $this->amount);
 
         return $this->convert($amount, $this->currency_code, $this->currency_rate, $format);
     }
 
     public function getReverseConvertedAmount($format = false, $with_tax = true)
     {
-        $amount = $with_tax ? $this->amount : isset($this->amount_without_tax) ? $this->amount_without_tax : $this->amount;
+        $amount = $with_tax ? $this->amount : (isset($this->amount_without_tax) ? $this->amount_without_tax : $this->amount);
 
         return $this->reverseConvert($amount, $this->currency_code, $this->currency_rate, $format);
     }
 
     public function getDynamicConvertedAmount($format = false, $with_tax = true)
     {
-        $amount = $with_tax ? $this->amount : isset($this->amount_without_tax) ? $this->amount_without_tax : $this->amount;
+        $amount = $with_tax ? $this->amount : (isset($this->amount_without_tax) ? $this->amount_without_tax : $this->amount);
 
         return $this->dynamicConvert($this->default_currency_code, $amount, $this->currency_code, $this->currency_rate, $format);
     }
diff --git a/resources/views/common/items/create.blade.php b/resources/views/common/items/create.blade.php
index b9f56d58b..647279ccd 100644
--- a/resources/views/common/items/create.blade.php
+++ b/resources/views/common/items/create.blade.php
@@ -98,10 +98,18 @@
 
         $('#name').focus();
 
-        $("#tax_id").select2({
+        $('#tax_id').select2({
             placeholder: {
                 id: '-1', // the value of the option
                 text: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}"
+            },
+            escapeMarkup: function (markup) {
+                return markup;
+            },
+            language: {
+                noResults: function () {
+                    return '<span id="tax-add-new plus"><i class="fa fa-plus"></i> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
+                }
             }
         });
 
@@ -116,6 +124,26 @@
         });
     });
 
+    $(document).on('click', '.select2-results__option.select2-results__message', function(e) {
+        tax_name = $('.select2-search__field').val();
+
+        $('body > .select2-container.select2-container--default.select2-container--open').remove();
+
+        $('#modal-create-tax').remove();
+
+        $.ajax({
+            url: '{{ url("modals/taxes/create") }}',
+            type: 'GET',
+            dataType: 'JSON',
+            data: {name: tax_name},
+            success: function(json) {
+                if (json['success']) {
+                    $('body').append(json['html']);
+                }
+            }
+        });
+    });
+
     $(document).on('click', '#button-category', function (e) {
         $('#modal-create-category').remove();
 
diff --git a/resources/views/common/items/edit.blade.php b/resources/views/common/items/edit.blade.php
index 9bb5df5b1..2c998f010 100644
--- a/resources/views/common/items/edit.blade.php
+++ b/resources/views/common/items/edit.blade.php
@@ -87,10 +87,18 @@
             $("#sale_price").focusout();
             $("#purchase_price").focusout();*/
 
-            $("#tax_id").select2({
+            $('#tax_id').select2({
                 placeholder: {
                     id: '-1', // the value of the option
                     text: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}"
+                },
+                escapeMarkup: function (markup) {
+                    return markup;
+                },
+                language: {
+                    noResults: function () {
+                        return '<span id="tax-add-new plus"><i class="fa fa-plus"></i> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
+                    }
                 }
             });
 
@@ -129,5 +137,25 @@
                 });
             @endif
         });
+
+        $(document).on('click', '.select2-results__option.select2-results__message', function(e) {
+            tax_name = $('.select2-search__field').val();
+
+            $('body > .select2-container.select2-container--default.select2-container--open').remove();
+
+            $('#modal-create-tax').remove();
+
+            $.ajax({
+                url: '{{ url("modals/taxes/create") }}',
+                type: 'GET',
+                dataType: 'JSON',
+                data: {name: tax_name},
+                success: function(json) {
+                    if (json['success']) {
+                        $('body').append(json['html']);
+                    }
+                }
+            });
+        });
     </script>
 @endpush