diff --git a/astrid/src/main/AndroidManifest.xml b/astrid/src/main/AndroidManifest.xml
index eee149f11..2a2fe9e83 100644
--- a/astrid/src/main/AndroidManifest.xml
+++ b/astrid/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.tasks"
           android:versionName="4.6.9"
-          android:versionCode="318">
+          android:versionCode="320">
           
   <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
   <!--    android:installLocation="internalOnly"> -->
diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
index fcf7a675a..bc7e5fd06 100755
--- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -839,7 +839,11 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
     public boolean onKeyDown(int keyCode) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
-            discardButtonClick();
+            if(title.getText().length() == 0) {
+                discardButtonClick();
+            } else {
+                saveButtonClick();
+            }
             return true;
         }
         return false;