diff --git a/app/src/main/java/me/impy/aegis/ui/GroupManagerActivity.java b/app/src/main/java/me/impy/aegis/ui/GroupManagerActivity.java
index 2d53dd2f..f748fbf9 100644
--- a/app/src/main/java/me/impy/aegis/ui/GroupManagerActivity.java
+++ b/app/src/main/java/me/impy/aegis/ui/GroupManagerActivity.java
@@ -1,6 +1,7 @@
 package me.impy.aegis.ui;
 
 import android.os.Bundle;
+import android.view.MenuItem;
 
 import java.util.TreeSet;
 
@@ -64,4 +65,17 @@ public class GroupManagerActivity extends AegisActivity implements GroupAdapter.
                 .setNegativeButton(android.R.string.no, null)
                 .create());
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                onBackPressed();
+                break;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+
+        return true;
+    }
 }
diff --git a/app/src/main/java/me/impy/aegis/ui/views/EntryListView.java b/app/src/main/java/me/impy/aegis/ui/views/EntryListView.java
index 2b2a9027..0a01803b 100644
--- a/app/src/main/java/me/impy/aegis/ui/views/EntryListView.java
+++ b/app/src/main/java/me/impy/aegis/ui/views/EntryListView.java
@@ -59,7 +59,7 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         int resId = R.anim.layout_animation_fall_down;
         LayoutAnimationController animation = AnimationUtils.loadLayoutAnimation(getContext(), resId);
         _rvKeyProfiles.setLayoutAnimation(animation);
-        
+
         _refresher = new UiRefresher(new UiRefresher.Listener() {
             @Override
             public void onRefresh() {