diff --git a/app/src/main/java/com/hotbitmapgg/moequest/module/commonality/AppSplashActivity.java b/app/src/main/java/com/hotbitmapgg/moequest/module/commonality/AppSplashActivity.java
index 312a692..687762f 100644
--- a/app/src/main/java/com/hotbitmapgg/moequest/module/commonality/AppSplashActivity.java
+++ b/app/src/main/java/com/hotbitmapgg/moequest/module/commonality/AppSplashActivity.java
@@ -38,6 +38,8 @@ public class AppSplashActivity extends Activity
 
     private Subscription subscribe;
 
+	private AnimatorSet mSplashSet;
+
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
@@ -65,11 +67,11 @@ private void startAnim()
         ObjectAnimator animatorX = ObjectAnimator.ofFloat(mSplashImage, "scaleX", 1f, SCALE_END);
         ObjectAnimator animatorY = ObjectAnimator.ofFloat(mSplashImage, "scaleY", 1f, SCALE_END);
 
-        AnimatorSet set = new AnimatorSet();
-        set.setDuration(ANIMATION_TIME).play(animatorX).with(animatorY);
-        set.start();
+        mSplashSet = new AnimatorSet();
+	    mSplashSet.setDuration(ANIMATION_TIME).play(animatorX).with(animatorY);
+	    mSplashSet.start();
 
-        set.addListener(new AnimatorListenerAdapter()
+	    mSplashSet.addListener(new AnimatorListenerAdapter()
         {
 
             @Override
@@ -92,6 +94,9 @@ public void onBackPressed()
         {
             subscribe.unsubscribe();
         }
+	    if (mSplashSet != null) {
+		    mSplashSet.removeAllListeners();
+	    }
     }
 
 }
diff --git a/app/src/main/java/com/hotbitmapgg/moequest/module/commonality/MainActivity.java b/app/src/main/java/com/hotbitmapgg/moequest/module/commonality/MainActivity.java
index d7722ca..88f7a53 100644
--- a/app/src/main/java/com/hotbitmapgg/moequest/module/commonality/MainActivity.java
+++ b/app/src/main/java/com/hotbitmapgg/moequest/module/commonality/MainActivity.java
@@ -8,6 +8,7 @@
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.widget.Toolbar;
+import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.MenuItem;
 import android.view.View;
@@ -198,7 +199,7 @@ public void changIndex(int changNum, String title, MenuItem item)
     }
 
 
-    public void switchFragment(Fragment fragment)
+    private void switchFragment(Fragment fragment)
     {
 
         FragmentTransaction trx = getSupportFragmentManager().beginTransaction();
@@ -218,7 +219,12 @@ public boolean onKeyDown(int keyCode, KeyEvent event)
 
         if (keyCode == KeyEvent.KEYCODE_BACK)
         {
-            logoutApp();
+
+	        if (mNavigationView.isShown()) {
+		        mDrawerLayout.closeDrawer(Gravity.START);
+	        } else {
+		        logoutApp();
+	        }
         }
 
         return true;