diff --git a/DataStorage/Datastore.cs b/DataStorage/Datastore.cs
index df80b9406..499b965ee 100644
--- a/DataStorage/Datastore.cs
+++ b/DataStorage/Datastore.cs
@@ -110,14 +110,18 @@ namespace MatterHackers.MatterControl.DataStorage
                         {
                             return "StaticData";
                         }
-                        else
-                        {
-                            return Path.Combine(ApplicationPath, "StaticData");
-                        }
+						else if(Directory.Exists(Path.Combine(ApplicationPath, "StaticData")))
+						{
+							return Path.Combine(ApplicationPath, "StaticData");
+						}
+						else
+						{
+							return Path.Combine("..", "..", "StaticData");
+						}
 
                     default:
                         throw new NotImplementedException();
-                }
+				}
             }
         }