diff --git a/src/assets/js/wishlists.js b/src/assets/js/wishlists.js
index 72e16ed3..9a7a0685 100644
--- a/src/assets/js/wishlists.js
+++ b/src/assets/js/wishlists.js
@@ -640,7 +640,7 @@ $(function () {
                 }
 
                 /** URL */
-                if (wishURLCurrent !== wishInfoProposed.url && validateURL) {
+                if (wishURLCurrent && wishInfoProposed.url && wishURLCurrent !== wishInfoProposed.url && validateURL) {
                     modalValidate.find('input.current').val(wishURLCurrent);
                     modalValidate.find('input.proposed').val(wishInfoProposed.url);
                     modalValidate
@@ -706,7 +706,11 @@ $(function () {
                     /** */
                 }
             })
-            .catch(handleFetchCatch);
+            .catch(handleFetchCatch)
+            .finally(function() {
+                formAddOrEdit.removeClass('loading');
+                buttonAddOrSave.removeClass('disabled');
+            });
         } else {
             /** Save form edit fields */
             /** This code block is a duplicate, please refactor */