diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/DownloadFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/DownloadFragment.java
index 8f072230..290672d6 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/DownloadFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/DownloadFragment.java
@@ -100,15 +100,12 @@ public class DownloadFragment extends Fragment {
 
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_search:
-                activity.navController.navigate(R.id.action_downloadFragment_to_searchFragment);
-                return true;
-            case R.id.action_settings:
-                activity.navController.navigate(R.id.action_downloadFragment_to_settingsFragment);
-                return true;
-            default:
-                break;
+        if (item.getItemId() == R.id.action_search) {
+            activity.navController.navigate(R.id.action_downloadFragment_to_searchFragment);
+            return true;
+        } else if (item.getItemId() == R.id.action_settings) {
+            activity.navController.navigate(R.id.action_downloadFragment_to_settingsFragment);
+            return true;
         }
 
         return false;
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java
index 4300ed93..a114f345 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java
@@ -114,15 +114,12 @@ public class HomeFragment extends Fragment {
 
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_search:
-                activity.navController.navigate(R.id.action_homeFragment_to_searchFragment);
-                return true;
-            case R.id.action_settings:
-                activity.navController.navigate(R.id.action_homeFragment_to_settingsFragment);
-                return true;
-            default:
-                break;
+        if (item.getItemId() == R.id.action_search) {
+            activity.navController.navigate(R.id.action_homeFragment_to_searchFragment);
+            return true;
+        } else if (item.getItemId() == R.id.action_settings) {
+            activity.navController.navigate(R.id.action_homeFragment_to_settingsFragment);
+            return true;
         }
 
         return false;
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/LibraryFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/LibraryFragment.java
index 67c96281..325c14a8 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/LibraryFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/LibraryFragment.java
@@ -101,15 +101,12 @@ public class LibraryFragment extends Fragment {
 
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_search:
-                activity.navController.navigate(R.id.action_libraryFragment_to_searchFragment);
-                return true;
-            case R.id.action_settings:
-                activity.navController.navigate(R.id.action_libraryFragment_to_settingsFragment);
-                return true;
-            default:
-                break;
+        if (item.getItemId() == R.id.action_search) {
+            activity.navController.navigate(R.id.action_libraryFragment_to_searchFragment);
+            return true;
+        } else if (item.getItemId() == R.id.action_settings) {
+            activity.navController.navigate(R.id.action_libraryFragment_to_settingsFragment);
+            return true;
         }
 
         return false;