diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 47c17c0..71d3fcc 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -39,8 +39,8 @@ android {
         applicationId = "us.huseli.retain"
         minSdk = 26
         targetSdk = targetSdk
-        versionCode = 5
-        versionName = "1.0.0-beta.5"
+        versionCode = 6
+        versionName = "1.0.0-beta.6"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         // buildConfigField("String", "dropboxAppKey", "\"${dropboxAppKey}\"")
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 6d03462..48faaa7 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,9 +11,9 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 5,
-      "versionName": "1.0.0-beta.5",
-      "outputFile": "retain_1.0.0-beta.5-release.apk"
+      "versionCode": 6,
+      "versionName": "1.0.0-beta.6",
+      "outputFile": "retain_1.0.0-beta.6-release.apk"
     }
   ],
   "elementType": "File"
diff --git a/app/release/retain_1.0.0-beta.5-release.apk b/app/release/retain_1.0.0-beta.6-release.apk
similarity index 84%
rename from app/release/retain_1.0.0-beta.5-release.apk
rename to app/release/retain_1.0.0-beta.6-release.apk
index 7090813..623388b 100644
Binary files a/app/release/retain_1.0.0-beta.5-release.apk and b/app/release/retain_1.0.0-beta.6-release.apk differ
diff --git a/app/src/main/java/us/huseli/retain/compose/notescreen/ChecklistNoteChecklist.kt b/app/src/main/java/us/huseli/retain/compose/notescreen/ChecklistNoteChecklist.kt
index e6cca96..19f9e7a 100644
--- a/app/src/main/java/us/huseli/retain/compose/notescreen/ChecklistNoteChecklist.kt
+++ b/app/src/main/java/us/huseli/retain/compose/notescreen/ChecklistNoteChecklist.kt
@@ -113,27 +113,28 @@ fun LazyListScope.ChecklistNoteChecklist(
             }
         } else item { Spacer(Modifier.height(4.dp)) }
 
-        item {
-            // "Add item" link:
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier
-                    .clickable(onClick = onAddItemClick)
-                    .padding(vertical = 8.dp)
-                    .fillMaxWidth()
-            ) {
-                Icon(
-                    imageVector = Icons.Sharp.Add,
-                    contentDescription = null,
-                    modifier = Modifier.padding(horizontal = 12.dp),
-                    tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f),
-                )
-                Text(
-                    text = stringResource(R.string.add_item),
-                    color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f),
-                    modifier = Modifier.padding(horizontal = 6.dp)
-                )
-            }
+    }
+
+    item {
+        // "Add item" link:
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .clickable(onClick = onAddItemClick)
+                .padding(vertical = 8.dp)
+                .fillMaxWidth()
+        ) {
+            Icon(
+                imageVector = Icons.Sharp.Add,
+                contentDescription = null,
+                modifier = Modifier.padding(horizontal = 12.dp),
+                tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f),
+            )
+            Text(
+                text = stringResource(R.string.add_item),
+                color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f),
+                modifier = Modifier.padding(horizontal = 6.dp)
+            )
         }
     }
 }
diff --git a/app/src/main/java/us/huseli/retain/compose/notescreen/NoteScreen.kt b/app/src/main/java/us/huseli/retain/compose/notescreen/NoteScreen.kt
index d91fdf9..6f454a5 100644
--- a/app/src/main/java/us/huseli/retain/compose/notescreen/NoteScreen.kt
+++ b/app/src/main/java/us/huseli/retain/compose/notescreen/NoteScreen.kt
@@ -138,7 +138,7 @@ fun NoteScreen(
                 NoteScreenTopAppBar(
                     backgroundColor = appBarColor,
                     onBackClick = {
-                        viewModel.save()
+                        if (isUnsaved) viewModel.save()
                         onBackClick()
                     },
                     onImagePick = { uri -> viewModel.insertImage(uri) },
diff --git a/app/src/main/java/us/huseli/retain/viewmodels/NoteViewModel.kt b/app/src/main/java/us/huseli/retain/viewmodels/NoteViewModel.kt
index 3f8d9c2..ac12f04 100644
--- a/app/src/main/java/us/huseli/retain/viewmodels/NoteViewModel.kt
+++ b/app/src/main/java/us/huseli/retain/viewmodels/NoteViewModel.kt
@@ -41,7 +41,7 @@ class NoteViewModel @Inject constructor(
     private val _checklistItems = MutableStateFlow<List<ChecklistItem>>(emptyList())
     private val _selectedImages = MutableStateFlow<Set<String>>(emptySet())
     private val _focusedChecklistItemId = MutableStateFlow<UUID?>(null)
-    private val _isUnsaved = MutableStateFlow(true)
+    private val _isUnsaved = MutableStateFlow(false)
     private val _checklistItemUndoState = MutableStateFlow<List<ChecklistItem>?>(null)
     private val _imageUndoState = MutableStateFlow<List<Image>?>(null)