diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index 533f47b8ef..eba725bafc 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -4256,6 +4256,7 @@ static int context_menu(void)
                     /* add a leading slash so that catalog_add_to_a_playlist
                        later prefills the name when creating a new playlist */
                     rb->snprintf(album_name, MAX_PATH, "/%s", get_album_name(center_index));
+                    rb->fix_path_part(album_name, 1, sizeof(album_name) - 2);
                     file_name = album_name;
                     attr = ATTR_DIRECTORY;
                 }
diff --git a/apps/tree.c b/apps/tree.c
index f1959e404e..0e78d8ba3e 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -900,6 +900,7 @@ static int dirbrowse(void)
                             attr = ATTR_DIRECTORY;
                             tagtree_get_entry_name(&tc, tc.selected_item,
                                                    buf, sizeof(buf));
+                            fix_path_part(buf, 0, sizeof(buf) - 1);
                         }
                     }
                     else