diff --git a/app/src/main/java/net/headlezz/notificationlogger/MainActivity.java b/app/src/main/java/net/headlezz/notificationlogger/MainActivity.java
index fbd0349..b2b65de 100644
--- a/app/src/main/java/net/headlezz/notificationlogger/MainActivity.java
+++ b/app/src/main/java/net/headlezz/notificationlogger/MainActivity.java
@@ -55,6 +55,8 @@ public class MainActivity extends AppCompatActivity {
             Intent intent = new Intent(this, PreferenceActivity.class);
             startActivity(intent);
             return true;
+        } else if(item.getItemId() == android.R.id.home) {
+            onBackPressed();
         }
         return super.onOptionsItemSelected(item);
     }
@@ -67,13 +69,19 @@ public class MainActivity extends AppCompatActivity {
                 .addToBackStack(NotificationCreationFragment.class.getSimpleName())
                 .commit();
         mFAB.setVisibility(View.GONE);
+        getSupportActionBar().setTitle(getString(R.string.title_create_notification));
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     }
 
+    @SuppressWarnings("ConstantConditions")
     @Override
     public void onBackPressed() {
-        // make fab visible if we come back to first fragment
-        if(getSupportFragmentManager().getBackStackEntryCount() == 1)
+        // make fab visible and change title if we come back to first fragment
+        if(getSupportFragmentManager().getBackStackEntryCount() == 1) {
             mFAB.setVisibility(View.VISIBLE);
+            getSupportActionBar().setTitle(getString(R.string.app_name));
+            getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+        }
         super.onBackPressed();
     }
 }
diff --git a/app/src/main/java/net/headlezz/notificationlogger/NotificationCreationFragment.java b/app/src/main/java/net/headlezz/notificationlogger/NotificationCreationFragment.java
index 024841f..87a62c4 100644
--- a/app/src/main/java/net/headlezz/notificationlogger/NotificationCreationFragment.java
+++ b/app/src/main/java/net/headlezz/notificationlogger/NotificationCreationFragment.java
@@ -1,10 +1,8 @@
 package net.headlezz.notificationlogger;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -22,10 +20,4 @@ public class NotificationCreationFragment extends Fragment {
         return textView;
     }
 
-    @SuppressWarnings("ConstantConditions")
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-        ((AppCompatActivity) activity).getSupportActionBar().setTitle(getString(R.string.title_create_notification));
-    }
 }
diff --git a/app/src/main/java/net/headlezz/notificationlogger/NotificationListFragment.java b/app/src/main/java/net/headlezz/notificationlogger/NotificationListFragment.java
index 31ced62..9e53867 100644
--- a/app/src/main/java/net/headlezz/notificationlogger/NotificationListFragment.java
+++ b/app/src/main/java/net/headlezz/notificationlogger/NotificationListFragment.java
@@ -1,10 +1,8 @@
 package net.headlezz.notificationlogger;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -22,10 +20,4 @@ public class NotificationListFragment extends Fragment {
         return textView;
     }
 
-    @SuppressWarnings("ConstantConditions")
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-        ((AppCompatActivity) activity).getSupportActionBar().setTitle(getString(R.string.app_name));
-    }
 }