diff --git a/static/js/wishlists.js b/static/js/wishlists.js
index 2e0057b..297c859 100644
--- a/static/js/wishlists.js
+++ b/static/js/wishlists.js
@@ -22,17 +22,21 @@ function enableEditMode() {
 function disableEditMode() {
   $('#listData').hide();
   $('#cancelButton').hide();
-  $('#editButton').show();
+  if (curList) {
+    $('#editButton').show();
+  } else {
+    $('#editButton').hide();
+  }
   $('#saveButton').hide();
 }
 
 function triggerSelect(listId) {
   console.debug('Switch selection to list ' + listId);
-  disableEditMode();
   if (curList) {
     $('.nav-link[data-list-id="' + curList.id + '"]').removeClass('active');
   }
   $('.nav-link[data-list-id="' + listId + '"]').addClass('active');
+  disableEditMode();
 
   $.ajax({
     url: '/lists/' + listId,