diff --git a/gui/src/aaregui/panels/file_path_panel.py b/gui/src/aaregui/panels/file_path_panel.py
index a7bc05e4..c79eca87 100644
--- a/gui/src/aaregui/panels/file_path_panel.py
+++ b/gui/src/aaregui/panels/file_path_panel.py
@@ -143,7 +143,10 @@ class FilePathPanel(QWidget):
             self.__puck_name = sample.puck_name
             self.__puck_pos = sample.pin
             self.run_number_edit.setValue(1)
-            if sample.location is not None:
+
+            if sample.aaredb_params is not None and sample.aaredb_params.directory is not None:
+                self.directory_edit.setText(f"{sample.aaredb_params.directory}")
+            elif sample.location is not None:
                 self.directory_edit.setText(f"{self.__formatted_date}/{self.__puck_name}/{self.__puck_pos:02d}")
             else:
                 self.directory_edit.setText(f"{self.__formatted_date}/manual/{self.__sample_name}")