diff --git a/build.gradle b/build.gradle
index 7c8b2e51..e76f1145 100644
--- a/build.gradle
+++ b/build.gradle
@@ -93,8 +93,13 @@ dependencies {
     intTestImplementation group: 'org.assertj', name: 'assertj-swing-junit', version: '3.9.2'
 }
 
-application {
-    mainClass = 'studio.core.Studio'
+jar {
+    manifest {
+        attributes(
+            'Class-Path': configurations.runtimeClasspath.files.collect { it.getName() }.join(' '),
+            'Main-Class': 'studio.core.Studio'
+        )
+    }
 }
 
 def buildTime() {
diff --git a/src/main/studio/ui/StudioPanel.java b/src/main/studio/ui/StudioPanel.java
index 8c737654..211cd327 100755
--- a/src/main/studio/ui/StudioPanel.java
+++ b/src/main/studio/ui/StudioPanel.java
@@ -414,7 +414,8 @@ private void openOrSwitchToFile(String filename) {
         addToMruFiles(filename);
         for (int i=0; i<tabbedEditors.getTabCount(); ++i) {
             EditorTab tab = getEditor(i);
-            if (tab.getFilename().equals(filename)) {
+            String fileName = tab.getFilename();
+            if (fileName != null && fileName.equals(filename)) {
                 tabbedEditors.setSelectedIndex(i);
                 return;
             }