diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/NavigationDrawerItemAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/NavigationDrawerItemAdapter.java
index 86336248..887cfeae 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/NavigationDrawerItemAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/NavigationDrawerItemAdapter.java
@@ -73,11 +73,9 @@ public class NavigationDrawerItemAdapter extends RecyclerView.Adapter<Navigation
     }
 
     public void setChecked(int position) {
-        int oldPosition = currentChecked;
+//        int oldPosition = currentChecked;
         currentChecked = position;
-        if (oldPosition != -1)
-            notifyItemChanged(oldPosition);
-        notifyItemChanged(position);
+        notifyDataSetChanged();
     }
 
     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/NavigationDrawerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/NavigationDrawerFragment.java
index d340b741..dc29e296 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/NavigationDrawerFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/NavigationDrawerFragment.java
@@ -3,7 +3,6 @@ package com.kabouzeid.gramophone.ui.fragments;
 import android.app.Activity;
 import android.app.Fragment;
 import android.os.Bundle;
-import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
@@ -154,14 +153,8 @@ public class NavigationDrawerFragment extends Fragment {
         if (position != NAVIGATION_DRAWER_HEADER &&
                 position != ABOUT_INDEX && position != SETTINGS_INDEX) {
             setItemChecked(position);
-            if (drawerLayout != null) {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        drawerLayout.closeDrawers();
-                    }
-                }, 200);
-            }
+            if (drawerLayout != null)
+                drawerLayout.closeDrawers();
         }
         if (callbacks != null)
             callbacks.onNavigationDrawerItemSelected(position);