diff --git a/firmware/application/apps/replay_app.cpp b/firmware/application/apps/replay_app.cpp
index 0766550f..3e81386a 100644
--- a/firmware/application/apps/replay_app.cpp
+++ b/firmware/application/apps/replay_app.cpp
@@ -44,9 +44,9 @@ void ReplayAppView::on_file_changed(std::filesystem::path new_file_path) {
 	
 	file_path = new_file_path;
 	
-	text_filename.set(new_file_path.string().substr(0, 19));
+	text_filename.set(file_path.filename().string().substr(0, 19));
 	
-	bbd_file.open("/" + new_file_path.string());
+	bbd_file.open("/" + file_path.string());
 	auto file_size = bbd_file.size();
 	auto duration = (file_size * 1000) / (2 * 2 * sampling_rate / 8);
 	
diff --git a/firmware/application/apps/ui_fileman.cpp b/firmware/application/apps/ui_fileman.cpp
index 2123bcbd..f57afb48 100644
--- a/firmware/application/apps/ui_fileman.cpp
+++ b/firmware/application/apps/ui_fileman.cpp
@@ -231,7 +231,7 @@ FileLoadView::FileLoadView(
 		} else {
 			nav_.pop();
 			if (on_changed)
-				on_changed(entry_list[menu_view.highlighted_index()].entry_path);
+				on_changed(current_path.string() + '/' + entry_list[menu_view.highlighted_index()].entry_path.string());
 		}
 	};
 }
diff --git a/firmware/portapack-h1-havoc.bin b/firmware/portapack-h1-havoc.bin
index 5d3fb694..2a94f989 100644
Binary files a/firmware/portapack-h1-havoc.bin and b/firmware/portapack-h1-havoc.bin differ
diff --git a/sdcard/NOAAWEATHER.TXT b/sdcard/FREQMAN/NOAAWEATHER.TXT
similarity index 100%
rename from sdcard/NOAAWEATHER.TXT
rename to sdcard/FREQMAN/NOAAWEATHER.TXT