diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp
index 16452e4e469808366ee3dc53a0a37641e9a99c3b..bae00a890cfac7ec7ea7e96310b6710c913d7069 100644
--- a/Common/OpenFile.cpp
+++ b/Common/OpenFile.cpp
@@ -654,7 +654,8 @@ void ClearProject()
   Msg::Info("Done clearing all models and views");
 
   new GModel();
-  GModel::current()->setFileName(CTX::instance()->defaultFileName);
+  std::string base = (getenv("PWD") ? "" : CTX::instance()->homeDir);
+  GModel::current()->setFileName(base + CTX::instance()->defaultFileName);
   GModel::current()->setName("");
 #if defined(HAVE_FLTK)
   if(FlGui::available()){
diff --git a/Geo/GeoStringInterface.cpp b/Geo/GeoStringInterface.cpp
index d74c00c54488a5aa5b4513148c8fdcfadcd9fd42..8f10810b022bbe7000424112f9aef3b31518c915 100644
--- a/Geo/GeoStringInterface.cpp
+++ b/Geo/GeoStringInterface.cpp
@@ -27,8 +27,8 @@ void add_infile(const std::string &text, const std::string &fileNameOrEmpty)
 {
   std::string fileName = fileNameOrEmpty;
   if(fileName.empty()){
-    fileName = CTX::instance()->defaultFileName;
-    GModel::current()->setFileName(fileName);
+    std::string base = (getenv("PWD") ? "" : CTX::instance()->homeDir);
+    GModel::current()->setFileName(base + CTX::instance()->defaultFileName);
     GModel::current()->setName("");
   }