diff --git a/Habitica/assets/paperboy/changelog.json b/Habitica/assets/paperboy/changelog.json
index 60e13cd19..96ffd7abc 100644
--- a/Habitica/assets/paperboy/changelog.json
+++ b/Habitica/assets/paperboy/changelog.json
@@ -29,6 +29,10 @@
       {
         "type": "F",
         "title": "Quest-Text can now display the HTML correctly"
+      },
+      {
+        "type": "N",
+        "title": "Task filter drawer now closes when back button is pressed"
       }
     ]
   },
diff --git a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
index a116df93b..deb5d3a7c 100644
--- a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
@@ -15,6 +15,7 @@ import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.View;
@@ -449,6 +450,8 @@ public class MainActivity extends AppCompatActivity implements HabitRPGUserCallb
     public void onBackPressed() {
         if (drawer.isDrawerOpen()) {
             drawer.closeDrawer();
+        } else if (drawer.getDrawerLayout().isDrawerOpen(Gravity.RIGHT)) {
+            drawer.getDrawerLayout().closeDrawer(Gravity.RIGHT);
         } else {
             super.onBackPressed();
         }
@@ -570,7 +573,7 @@ public class MainActivity extends AppCompatActivity implements HabitRPGUserCallb
     }
 
 
-    public void onEvent(final DeleteTaskCommand cmd){
+    public void onEvent(final DeleteTaskCommand cmd) {
         mAPIHelper.apiService.deleteTask(cmd.TaskIdToDelete, new Callback<Void>() {
             @Override
             public void success(Void aVoid, Response response) {