diff --git a/.all-contributorsrc b/.all-contributorsrc
index e88cad6..71f9ba0 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -13,6 +13,15 @@
         "ideas",
         "code"
       ]
+    },
+    {
+      "login": "petergeneric",
+      "name": "Peter",
+      "avatar_url": "https://avatars.githubusercontent.com/u/870655?v=4",
+      "profile": "https://github.com/petergeneric",
+      "contributions": [
+        "ideas"
+      ]
     }
   ],
   "files": [
diff --git a/README.md b/README.md
index 1eb4473..d6470e3 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,7 @@ npm run dev # or: npm run build
   <tbody>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Michael-Tanzer"><img src="https://avatars.githubusercontent.com/u/23483071?v=4?s=100" width="100px;" alt="Michael Tanzer"/><br /><sub><b>Michael Tanzer</b></sub></a><br /><a href="#ideas-Michael-Tanzer" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/Niek/chatgpt-web/commits?author=Michael-Tanzer" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/petergeneric"><img src="https://avatars.githubusercontent.com/u/870655?v=4?s=100" width="100px;" alt="Peter"/><br /><sub><b>Peter</b></sub></a><br /><a href="#ideas-petergeneric" title="Ideas, Planning, & Feedback">🤔</a></td>
     </tr>
   </tbody>
 </table>
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..cc8b9e5 100644
--- a/src/lib/Chat.svelte
+++ b/src/lib/Chat.svelte
@@ -62,6 +62,7 @@
       },
     });
     */
+
     const response: Response = await (
       await fetch("https://api.openai.com/v1/chat/completions", {
         method: "POST",
@@ -105,7 +106,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 +115,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);
+            }
           }}
         >
           ✏️