diff --git a/packages/Webkul/Admin/src/Resources/views/export/export.blade.php b/packages/Webkul/Admin/src/Resources/views/export/export.blade.php
index 0ef3cb25a..3a649e84c 100644
--- a/packages/Webkul/Admin/src/Resources/views/export/export.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/export/export.blade.php
@@ -20,7 +20,7 @@
             </div>
         </div>
 
-        <button type="submit" class="btn btn-lg btn-primary" @click="closeModal">
+        <button type="submit" class="btn btn-lg btn-primary">
             {{ __('admin::app.export.export') }}
         </button>
 
@@ -29,11 +29,8 @@
 
 <script>
     Vue.component('export-form', {
+
         template: '#export-form-template',
-        methods: {
-            closeModal () {
-                this.$parent.closeModal();
-            }
-        }
+
     });
 </script>
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php
index f80b11e41..3fd6e450e 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php
@@ -167,6 +167,7 @@
 
                         this.reloadPrice();
                         this.changeProductImages();
+                        this.changeStock(this.simpleProduct);
                     },
 
                     getSelectedIndex (attribute, value) {
@@ -320,6 +321,16 @@
                             });
                         }
                     },
+
+                    changeStock(productId) {
+                        var inStockElement = document.getElementById('in-stock');
+
+                        if (productId) {
+                            inStockElement.style.display= "block";
+                        } else {
+                            inStockElement.style.display= "none";
+                        }
+                    },
                 }
 
             });
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/stock.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/stock.blade.php
index 3bd7046bd..0e39eb19d 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/view/stock.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view/stock.blade.php
@@ -1,7 +1,13 @@
 {!! view_render_event('bagisto.shop.products.view.stock.before', ['product' => $product]) !!}
 
-<div class="stock-status {{ $product->type != 'configurable' && ! $product->haveSufficientQuantity(1) ? '' : 'active' }}">
-    {{ $product->type != 'configurable' && ! $product->haveSufficientQuantity(1) ? __('shop::app.products.out-of-stock') : __('shop::app.products.in-stock') }}
-</div>
+@if ($product->type == 'simple')
+    <div class="stock-status {{! $product->haveSufficientQuantity(1) ? '' : 'active' }}">
+        {{ $product->haveSufficientQuantity(1) ? __('shop::app.products.in-stock') : __('shop::app.products.out-of-stock') }}
+    </div>
+@else
+    <div class="stock-status in-stock" id="in-stock" style="display: none;">
+        {{ __('shop::app.products.in-stock') }}
+    </div>
+@endif
 
 {!! view_render_event('bagisto.shop.products.view.stock.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
index b34542378..e3ecd1a26 100755
--- a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
+++ b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
@@ -298,4 +298,4 @@ class TaxRateController extends Controller
 
         return redirect()->route($this->_config['redirect']);
     }
-}
+}
\ No newline at end of file