diff --git a/app/js/custom.js b/app/js/custom.js
index 396d5555..7a885472 100644
--- a/app/js/custom.js
+++ b/app/js/custom.js
@@ -245,6 +245,9 @@ $('#hostapdModal').on('shown.bs.modal', function (e) {
     }, 1000);
 });
 
+$('#configureClientModal').on('shown.bs.modal', function (e) {
+});
+
 /*
 Sets the wirelss channel select options based on hw_mode and country_code.
 
diff --git a/templates/configure_client.php b/templates/configure_client.php
index 90b0a071..21a23a75 100755
--- a/templates/configure_client.php
+++ b/templates/configure_client.php
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row" id="wifiClientContent">
   <div class="col-lg-12">
     <div class="card">
       <div class="card-header">
@@ -34,3 +34,21 @@
     </div><!-- /.card -->
   </div><!-- /.col-lg-12 -->
 </div><!-- /.row -->
+
+<!-- Modal -->
+<div class="modal fade" id="configureClientModal" tabindex="-1" role="dialog" aria-labelledby="ModalLabel" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+      <div class="modal-title" id="ModalLabel"><i class="fas fa-sync-alt mr-2"></i><?php echo _("Configuring WiFi Client"); ?></div>
+      </div>
+      <div class="modal-body">
+        <div class="col-md-12 mb-3 mt-1"><?php echo _("Configuring Wifi Client Interface..."); ?></div>
+      </div>
+      <div class="modal-footer">
+      <button type="button" class="btn btn-outline btn-primary" data-dismiss="modal"><?php echo _("Close"); ?></button>
+      </div>
+    </div>
+  </div>
+</div>
+
diff --git a/templates/wifi_stations.php b/templates/wifi_stations.php
index 176050c4..2a6872cc 100755
--- a/templates/wifi_stations.php
+++ b/templates/wifi_stations.php
@@ -89,12 +89,12 @@
 
         <div class="btn-group btn-block ">
             <?php if ($network['configured']) { ?>
-              <input type="submit" class="col-xs-4 col-md-4 btn btn-warning" value="<?php echo _("Update"); ?>" id="update<?php echo $index ?>" name="update<?php echo $index ?>"<?php echo ($network['protocol'] === 'Open' ? ' disabled' : '')?> />
+              <input type="submit" class="col-xs-4 col-md-4 btn btn-warning" value="<?php echo _("Update"); ?>" id="update<?php echo $index ?>" name="update<?php echo $index ?>"<?php echo ($network['protocol'] === 'Open' ? ' disabled' : '')?> data-toggle="modal" data-target="#configureClientModal" />
               <button type="submit" class="col-xs-4 col-md-4 btn btn-info" value="<?php echo $index?>" name="connect"><?php echo _("Connect"); ?></button>
             <?php } else { ?>
-              <input type="submit" class="col-xs-4 col-md-4 btn btn-info" value="<?php echo _("Add"); ?>" id="update<?php echo $index ?>" name="update<?php echo $index ?>" <?php echo ($network['protocol'] === 'Open' ? '' : ' disabled')?> />
+              <input type="submit" class="col-xs-4 col-md-4 btn btn-info" value="<?php echo _("Add"); ?>" id="update<?php echo $index ?>" name="update<?php echo $index ?>" <?php echo ($network['protocol'] === 'Open' ? '' : ' disabled')?> data-toggle="modal" data-target="#configureClientModal" />
             <?php } ?>
-              <input type="submit" class="col-xs-4 col-md-4 btn btn-danger" value="<?php echo _("Delete"); ?>" name="delete<?php echo $index ?>"<?php echo ($network['configured'] ? '' : ' disabled')?> />
+              <input type="submit" class="col-xs-4 col-md-4 btn btn-danger" value="<?php echo _("Delete"); ?>" name="delete<?php echo $index ?>"<?php echo ($network['configured'] ? '' : ' disabled')?> data-toggle="modal" data-target="#configureClientModal" />
         </div><!-- /.btn-group -->
       </div><!-- /.card-body -->
     </div><!-- /.card -->