diff --git a/core/src/main/java/com/volmit/iris/core/service/StudioSVC.java b/core/src/main/java/com/volmit/iris/core/service/StudioSVC.java
index 519a92b5f..fd5aec440 100644
--- a/core/src/main/java/com/volmit/iris/core/service/StudioSVC.java
+++ b/core/src/main/java/com/volmit/iris/core/service/StudioSVC.java
@@ -231,7 +231,7 @@ public class StudioSVC implements IrisService {
         }
 
         try {
-            dir = zipFiles.length == 1 && zipFiles[0].isDirectory() ? zipFiles[0] : null;
+            dir = zipFiles.length > 1 ? work : zipFiles[0].isDirectory() ? zipFiles[0] : null;
         } catch (NullPointerException e) {
             Iris.reportError(e);
             sender.sendMessage("Error when finding home directory. Are there any non-text characters in the file name?");