diff --git a/public/js/app.js b/public/js/app.js
index bd76950f5..04a720722 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -186,6 +186,39 @@ $(document).ready(function () {
             disable_input.trigger('change');
         }
     });
+
+    $("#recurring_frequency").select2();
+
+    $(document).on('change', '.input-group-recurring #recurring_frequency', function (e) {
+        var value = $(this).val();
+
+        var recurring_frequency = $('#recurring_frequency').parent().parent();
+        var recurring_interval = $('#recurring_interval').parent();
+        var recurring_custom_frequency = $('#recurring_custom_frequency').parent();
+        var recurring_count = $('#recurring_count').parent();
+
+        if (value == 'custom') {
+            recurring_frequency.removeClass('col-md-12').removeClass('col-md-12').addClass('col-md-4');
+
+            recurring_interval.removeClass('hidden');
+            recurring_custom_frequency.removeClass('hidden');
+            recurring_count.removeClass('hidden');
+
+            $("#recurring_custom_frequency").select2();
+        } else if(value == 'no' || value == '') {
+            recurring_frequency.removeClass('col-md-10').removeClass('col-md-4').addClass('col-md-12');
+
+            recurring_interval.addClass('hidden');
+            recurring_custom_frequency.addClass('hidden');
+            recurring_count.addClass('hidden');
+        } else {
+            recurring_frequency.removeClass('col-md-12').removeClass('col-md-4').addClass('col-md-10');
+
+            recurring_interval.addClass('hidden');
+            recurring_custom_frequency.addClass('hidden');
+            recurring_count.removeClass('hidden');
+        }
+    });
 });
 
 function confirmDelete(form_id, title, message, button_cancel, button_delete) {
diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php
index 9890f8a09..462721caa 100644
--- a/resources/views/expenses/bills/create.blade.php
+++ b/resources/views/expenses/bills/create.blade.php
@@ -61,7 +61,7 @@
                                 <input class="form-control text-right" required="required" name="item[{{ $item_row }}][price]" type="number" id="item-price-{{ $item_row }}">
                             </td>
                             <td>
-                                {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!}
+                                {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!}
                             </td>
                             <td class="text-right" style="vertical-align: middle;">
                                 <span id="item-total-{{ $item_row }}">0</span>
@@ -195,7 +195,7 @@
                 autoclose: true
             });
 
-            $(".select2").select2({
+            $(".tax-select2").select2({
                 placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}"
             });
 
diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/expenses/bills/edit.blade.php
index 3f9f57f73..05d996868 100644
--- a/resources/views/expenses/bills/edit.blade.php
+++ b/resources/views/expenses/bills/edit.blade.php
@@ -76,7 +76,7 @@
                                     <input class="form-control text-right" required="required" name="item[{{ $item_row }}][price]" type="number" id="item-price-{{ $item_row }}">
                                 </td>
                                 <td>
-                                    {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, null, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!}
+                                    {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, null, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!}
                                 </td>
                                 <td class="text-right" style="vertical-align: middle;">
                                     <span id="item-total-{{ $item_row }}">0</span>
@@ -203,7 +203,7 @@
                 autoclose: true
             });
 
-            $(".select2").select2({
+            $(".tax-select2").select2({
                 placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}"
             });
 
diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php
index 0bc6f6323..a4b1ccbe5 100644
--- a/resources/views/incomes/invoices/create.blade.php
+++ b/resources/views/incomes/invoices/create.blade.php
@@ -61,7 +61,7 @@
                                 <input class="form-control text-right" required="required" name="item[{{ $item_row }}][price]" type="number" id="item-price-{{ $item_row }}">
                             </td>
                             <td>
-                                {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!}
+                                {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!}
                             </td>
                             <td class="text-right" style="vertical-align: middle;">
                                 <span id="item-total-{{ $item_row }}">0</span>
@@ -196,7 +196,7 @@
                 autoclose: true
             });
 
-            $(".select2").select2({
+            $(".tax-select2").select2({
                 placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}"
             });
 
diff --git a/resources/views/incomes/invoices/edit.blade.php b/resources/views/incomes/invoices/edit.blade.php
index 0f778a659..98fb6f761 100644
--- a/resources/views/incomes/invoices/edit.blade.php
+++ b/resources/views/incomes/invoices/edit.blade.php
@@ -51,7 +51,7 @@
                                     <input value="{{ $item->price }}" class="form-control text-right" required="required" name="item[{{ $item_row }}][price]" type="number" id="item-price-{{ $item_row }}">
                                 </td>
                                 <td>
-                                    {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.enter', ['field' => trans_choice('general.taxes', 1)])]) !!}
+                                    {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'placeholder' => trans('general.form.enter', ['field' => trans_choice('general.taxes', 1)])]) !!}
                                 </td>
                                 <td class="text-right" style="vertical-align: middle;">
                                     <span id="item-total-{{ $item_row }}">@money($item->total, $invoice->currency_code, true)</span>
@@ -202,7 +202,7 @@
                 autoclose: true
             });
 
-            $(".select2").select2({
+            $(".tax-select2").select2({
                 placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}"
             });
 
diff --git a/resources/views/partials/form/recurring.blade.php b/resources/views/partials/form/recurring.blade.php
index ed39abd4e..23bffbcfb 100644
--- a/resources/views/partials/form/recurring.blade.php
+++ b/resources/views/partials/form/recurring.blade.php
@@ -13,7 +13,7 @@
     }
 @endphp
 
-<div class="col-md-6" style="padding-left: 0; padding-right: 0;">
+<div class="col-md-6 input-group-recurring" style="padding-left: 0; padding-right: 0;">
     <div class="form-group col-md-12 {{ $errors->has('recurring_frequency') ? 'has-error' : ''}}">
         {!! Form::label('recurring_frequency', trans('recurring.recurring'), ['class' => 'control-label']) !!}
         <div class="input-group">