diff --git a/app/src/main/java/app/simple/peri/compose/commons/WallpapersList.kt b/app/src/main/java/app/simple/peri/compose/commons/WallpapersList.kt
index 93b671ba..21192120 100644
--- a/app/src/main/java/app/simple/peri/compose/commons/WallpapersList.kt
+++ b/app/src/main/java/app/simple/peri/compose/commons/WallpapersList.kt
@@ -503,7 +503,8 @@ fun SelectionMenu(modifier: Modifier = Modifier,
 fun WallpaperMenu(setShowDialog: (Boolean) -> Unit,
                   wallpaper: Wallpaper,
                   onDelete: (Wallpaper) -> Unit,
-                  onSelect: () -> Unit = {}) {
+                  onSelect: () -> Unit = {},
+                  onAddTag: () -> Unit = {}) {
 
     val context = LocalContext.current
     val coroutineScope = rememberCoroutineScope()
@@ -616,7 +617,6 @@ fun WallpaperMenu(setShowDialog: (Boolean) -> Unit,
                     Button(
                             onClick = {
                                 showTagDialog.value = true
-                                setShowDialog(false)
                             },
                             colors = ButtonDefaults.buttonColors(
                                     containerColor = Color.White,
diff --git a/app/src/main/java/app/simple/peri/compose/nav/Navigation.kt b/app/src/main/java/app/simple/peri/compose/nav/Navigation.kt
index 73fbb17d..b995d29d 100644
--- a/app/src/main/java/app/simple/peri/compose/nav/Navigation.kt
+++ b/app/src/main/java/app/simple/peri/compose/nav/Navigation.kt
@@ -16,7 +16,6 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import app.simple.peri.compose.screens.AutoWallpaper
-import app.simple.peri.compose.screens.FolderList
 import app.simple.peri.compose.screens.Folders
 import app.simple.peri.compose.screens.Home
 import app.simple.peri.compose.screens.Settings
@@ -24,6 +23,7 @@ import app.simple.peri.compose.screens.Setup
 import app.simple.peri.compose.screens.TaggedWallpapers
 import app.simple.peri.compose.screens.Tags
 import app.simple.peri.compose.screens.Wallpaper
+import app.simple.peri.compose.screens.WallpaperList
 import app.simple.peri.compose.screens.isSetupComplete
 import app.simple.peri.utils.ConditionUtils.invert
 
@@ -50,7 +50,7 @@ fun PeristyleNavigation(context: Context) {
         }
 
         composableWithTransitions(Routes.WALLPAPERS_LIST) {
-            FolderList(navController)
+            WallpaperList(navController)
         }
 
         composableWithTransitions(Routes.SETTINGS) {
diff --git a/app/src/main/java/app/simple/peri/compose/screens/FolderList.kt b/app/src/main/java/app/simple/peri/compose/screens/WallpaperList.kt
similarity index 95%
rename from app/src/main/java/app/simple/peri/compose/screens/FolderList.kt
rename to app/src/main/java/app/simple/peri/compose/screens/WallpaperList.kt
index fd088860..de178bd6 100644
--- a/app/src/main/java/app/simple/peri/compose/screens/FolderList.kt
+++ b/app/src/main/java/app/simple/peri/compose/screens/WallpaperList.kt
@@ -16,7 +16,7 @@ import app.simple.peri.models.Wallpaper
 import app.simple.peri.viewmodels.FolderDataViewModel
 
 @Composable
-fun FolderList(navController: NavController? = null) {
+fun WallpaperList(navController: NavController? = null) {
     val folder = navController?.previousBackStackEntry?.savedStateHandle?.get<Folder>(Routes.FOLDER_ARG)
 
     // Ensure folder is not null before proceeding