diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseMetadata.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseMetadata.java
index c9170b1e68..8e41aa0778 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseMetadata.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseMetadata.java
@@ -258,7 +258,10 @@ public final class CaseMetadata {
      * @return The case directory.
      */
     public String getCaseDirectory() {
-        return metadataFilePath.getParent().toString();
+        File caseDatabaseNameFile = new File(caseDatabaseName);
+        return (caseDatabaseNameFile.isAbsolute())
+                ? caseDatabaseNameFile.getParent()
+                : metadataFilePath.getParent().toString();
     }
 
     /**