diff --git a/includes/assets/js/wishlist-view.js b/includes/assets/js/wishlist-view.js
index 10dee88d..cd7b040e 100644
--- a/includes/assets/js/wishlist-view.js
+++ b/includes/assets/js/wishlist-view.js
@@ -9,10 +9,16 @@ $(function() {
 
         if (wishlistValue) {
             $('.wishlist-view').removeClass('disabled');
+        } else {
+            $('.wishlist-view').addClass('disabled');
+        }
+
+        const urlParams = new URLSearchParams(window.location.search);
+
+        if (wishlistValue === urlParams.get('wishlist')) {
             $('.wishlist-share').removeClass('disabled');
             $('.wishlist-delete button').removeClass('disabled');
         } else {
-            $('.wishlist-view').addClass('disabled');
             $('.wishlist-share').addClass('disabled');
             $('.wishlist-delete button').addClass('disabled');
         }
diff --git a/includes/pages/wishlist-product-add.php b/includes/pages/wishlist-product-add.php
index ffb626b4..1437e237 100644
--- a/includes/pages/wishlist-product-add.php
+++ b/includes/pages/wishlist-product-add.php
@@ -31,6 +31,7 @@ $page->navigation();
                 </div>
 
                 <div class="field">
+                    <label>Wishlist</label>
                     <select class="ui search selection dropdown loading wishlists" name="wishlist">
                         <option value="">Loading your wishlists...</option>
                     </select>
diff --git a/includes/pages/wishlist-view.php b/includes/pages/wishlist-view.php
index e1f83269..96a5df29 100644
--- a/includes/pages/wishlist-view.php
+++ b/includes/pages/wishlist-view.php
@@ -60,7 +60,7 @@ if (isset($_POST['wishlist_delete_id'])) {
                 <h2 class="ui header">Options</h1>
                 <p>Wishlist related options.</p>
 
-                <a class="ui small labeled icon button wishlist-share disabled" href="/?wishlist=<?= $wishlist['hash'] ?? '' ?>" target="_blank">
+                <a class="ui small labeled icon button wishlist-share <?= !isset($_GET['wishlist']) ? 'disabled' : '' ?>" href="/?wishlist=<?= $wishlist['hash'] ?? '' ?>" target="_blank">
                     <i class="share icon"></i>
                     Share
                 </a>
@@ -68,7 +68,7 @@ if (isset($_POST['wishlist_delete_id'])) {
                 <form class="ui form wishlist-delete" method="post" style="display: inline-block;">
                     <input type="hidden" name="wishlist_delete_id" />
 
-                    <button class="ui small labeled red icon button disabled" type="submit">
+                    <button class="ui small labeled red icon button <?= !isset($_GET['wishlist']) ? 'disabled' : '' ?>" type="submit">
                         <i class="trash icon"></i>
                         Delete
                     </button>