diff --git a/views/settingsgeneral.html b/views/settingsgeneral.html
index 6e1670b5a..c0dec5b57 100644
--- a/views/settingsgeneral.html
+++ b/views/settingsgeneral.html
@@ -324,7 +324,7 @@
             $('#save_button').prop('disabled', true).css('cursor', 'not-allowed');
 
             // Hide update_div if args.no-update
-            {% if args.no_update %}
+            {% if args.no_update or args.release_update %}
             $('#update_div').hide()
             {% endif %}
 
diff --git a/views/settingsradarr.html b/views/settingsradarr.html
index b6161531f..3a7a359ca 100644
--- a/views/settingsradarr.html
+++ b/views/settingsradarr.html
@@ -371,7 +371,11 @@
                 buttons: [{
                     text: 'Add',
                     action: function () {
-                        $('#addModal').modal('show');
+                        if (form_changed) {
+                            alert('You must save changes before adding a path mapping.')
+                        } else {
+                            $('#addModal').modal('show');
+                        }
                     }
                 },
                 {
diff --git a/views/settingssonarr.html b/views/settingssonarr.html
index 77e0dce06..e7ec5983b 100644
--- a/views/settingssonarr.html
+++ b/views/settingssonarr.html
@@ -394,7 +394,11 @@
                 buttons: [{
                     text: 'Add',
                     action: function () {
-                        $('#addModal').modal('show');
+                        if (form_changed) {
+                            alert('You must save changes before adding a path mapping.')
+                        } else {
+                            $('#addModal').modal('show');
+                        }
                     }
                 },
                 {