diff --git a/gui/src/aaregui/panels/file_path_panel.py b/gui/src/aaregui/panels/file_path_panel.py
index ca0809ea..b9baa579 100644
--- a/gui/src/aaregui/panels/file_path_panel.py
+++ b/gui/src/aaregui/panels/file_path_panel.py
@@ -133,14 +133,15 @@ class FilePathPanel(QWidget):
             self.__dewar_pos = "None"
             self.__puck_name = "Manual"
             self.__puck_pos = 99
+            self.directory_edit.setText(f"{self.__formatted_date}/test")
         else:
             self.__sample_name = sample.sample_name
             self.__dewar_pos = sample.loc_str()
             self.__puck_name = sample.puck_name
             self.__puck_pos = sample.pin
             self.run_number_edit.setValue(1)
-
-            #if sample.aaredb_params is not None and sample.aaredb_params.directory is not None:
-            #    self.directory_edit.setText(sample.aaredb_params.directory)
-
+            if sample.location is not None:
+                self.directory_edit.setText(f"{self.__formatted_date}/{self.__puck_name}/{self.__puck_pos}")
+            else:
+                self.directory_edit.setText(f"{self.__formatted_date}/manual/{self.__sample_name}")
             self.update_filename()