diff --git a/src/app.scss b/src/app.scss
index 9522ea3..2254112 100644
--- a/src/app.scss
+++ b/src/app.scss
@@ -28,7 +28,7 @@ a.is-disabled {
 }
 
 /* Show the edit button on hover of the chat name */
-.chatname:hover .editbutton {
+.chat-header:hover .editbutton {
   display: inline !important;
   text-decoration: none !important;
 }
diff --git a/src/lib/Chat.svelte b/src/lib/Chat.svelte
index 273541d..ff15ac0 100644
--- a/src/lib/Chat.svelte
+++ b/src/lib/Chat.svelte
@@ -105,7 +105,7 @@
   };
 </script>
 
-<nav class="level is-mobile">
+<nav class="level is-mobile chat-header">
   <div class="level-left chatname">
     <div class="level-item">
       <p class="subtitle is-5">
@@ -114,8 +114,11 @@
           href={"#"}
           class="greyscale ml-2 is-hidden editbutton"
           on:click|preventDefault={() => {
-            chat.name = prompt("Enter a new name for this chat", chat.name);
-            chatsStorage.set($chatsStorage);
+            let newChatName = prompt("Enter a new name for this chat", chat.name);
+            if (newChatName) {
+              chat.name = newChatName;
+              chatsStorage.set($chatsStorage);
+            }
           }}
         >
           ✏️