diff --git a/app/src/main/java/cloud/pablos/overload/ui/navigation/OverloadNavigationFab.kt b/app/src/main/java/cloud/pablos/overload/ui/navigation/OverloadNavigationFab.kt
index ce4ee0f..0dc7932 100644
--- a/app/src/main/java/cloud/pablos/overload/ui/navigation/OverloadNavigationFab.kt
+++ b/app/src/main/java/cloud/pablos/overload/ui/navigation/OverloadNavigationFab.kt
@@ -159,7 +159,9 @@ fun OverloadNavigationFab(
                     }
                 }
 
-                categoryState.categories.forEach { category ->
+                categoryState.categories.filter {
+                    categoryState.selectedCategory != it.id
+                }.forEach { category ->
                     SmallFloatingActionButton(
                         onClick = {
                             categoryEvent(CategoryEvent.SetSelectedCategory(category.id))
diff --git a/app/src/main/java/cloud/pablos/overload/ui/navigation/OverloadNavigationFabSmall.kt b/app/src/main/java/cloud/pablos/overload/ui/navigation/OverloadNavigationFabSmall.kt
index d525bcd..9a0cfcd 100644
--- a/app/src/main/java/cloud/pablos/overload/ui/navigation/OverloadNavigationFabSmall.kt
+++ b/app/src/main/java/cloud/pablos/overload/ui/navigation/OverloadNavigationFabSmall.kt
@@ -115,7 +115,9 @@ fun OverloadNavigationFabSmall(
                     )
                 }
 
-                categoryState.categories.forEach { category ->
+                categoryState.categories.filter {
+                    categoryState.selectedCategory != it.id
+                }.forEach { category ->
                     SmallFloatingActionButton(
                         onClick = {
                             categoryEvent(CategoryEvent.SetSelectedCategory(category.id))
diff --git a/app/src/main/java/cloud/pablos/overload/ui/tabs/configurations/ConfigurationsTab.kt b/app/src/main/java/cloud/pablos/overload/ui/tabs/configurations/ConfigurationsTab.kt
index 53bef3d..60cc2b8 100644
--- a/app/src/main/java/cloud/pablos/overload/ui/tabs/configurations/ConfigurationsTab.kt
+++ b/app/src/main/java/cloud/pablos/overload/ui/tabs/configurations/ConfigurationsTab.kt
@@ -222,7 +222,9 @@ fun ConfigurationsTab(
                 ConfigurationsTabItem(title = stringResource(id = R.string.categories))
             }
 
-            categoryState.categories.forEach { category ->
+            categoryState.categories.filter {
+                categoryState.selectedCategory != it.id
+            }.forEach { category ->
                 item {
                     ConfigurationsTabItem(
                         title = category.emoji + " " + category.name,