diff --git a/scripts/pi-hole/js/gravity.js b/scripts/pi-hole/js/gravity.js
index a208cae1..1a00ee27 100644
--- a/scripts/pi-hole/js/gravity.js
+++ b/scripts/pi-hole/js/gravity.js
@@ -32,9 +32,23 @@ $("#gravityBtn").on("click", () => {
     eventsource();
 });
 
+$("#gravityBtn").on("click", () => {
+    $("#gravityBtn").attr("disabled", true);
+    eventsource();
+});
+
 // Handle hiding of alerts
 $(function(){
     $("[data-hide]").on("click", function(){
         $(this).closest("." + $(this).attr("data-hide")).hide();
     });
+
+    // Do we want to start updating immediately?
+    // gravity.php?go
+    var searchString = window.location.search.substring(1);
+    if(searchString.indexOf("go") !== -1)
+    {
+        $("#gravityBtn").attr("disabled", true);
+        eventsource();
+    }
 });
diff --git a/settings.php b/settings.php
index df41e59d..fd68e495 100644
--- a/settings.php
+++ b/settings.php
@@ -11,6 +11,14 @@
 	}
 </style>
 
+<?php // Check if ad lists should be updated after saving ...
+if(isset($_POST["submit"])) {
+	if($_POST["submit"] == "saveupdate") {
+	// If that is the case -> refresh to the gravity page and start updating immediately
+?>
+<meta http-equiv="refresh" content="1;url=gravity.php?go">
+<?php }} ?>
+
 <?php if(isset($debug)){ ?>
 <div id="alDebug" class="alert alert-warning alert-dismissible fade in" role="alert">
     <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
@@ -665,8 +673,8 @@
 			</div>
 			<div class="box-footer">
 				<input type="hidden" name="field" value="adlists">
-				<label>Don't forget to run <a href="gravity.php">Update Lists</a> afterwards</label>
-				<button type="submit" class="btn btn-primary pull-right">Save</button>
+				<button type="submit" class="btn btn-primary" name="submit" value="save">Save</button>
+				<button type="submit" class="btn btn-primary pull-right" name="submit" value="saveupdate">Save and Update</button>
 			</div>
 			</form>
 		</div>