diff --git a/.idea/runConfigurations/App.xml b/.idea/runConfigurations/App.xml
index 13f3f0f88..da7e24112 100644
--- a/.idea/runConfigurations/App.xml
+++ b/.idea/runConfigurations/App.xml
@@ -2,6 +2,7 @@
   <configuration default="false" name="App" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="qz.App" />
     <module name="tray" />
+    <option name="PROGRAM_PARAMETERS" value="--steal" />
     <option name="VM_PARAMETERS" value="--add-opens java.desktop/sun.lwawt.macosx=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-exports java.desktop/com.apple.laf=ALL-UNNAMED --add-exports java.desktop/sun.swing=ALL-UNNAMED" />
     <method v="2">
       <option name="Make" enabled="true" />
diff --git a/src/qz/utils/SystemUtilities.java b/src/qz/utils/SystemUtilities.java
index ea6442662..6a31e48e6 100644
--- a/src/qz/utils/SystemUtilities.java
+++ b/src/qz/utils/SystemUtilities.java
@@ -20,6 +20,7 @@
 import org.apache.logging.log4j.Logger;
 import qz.common.Constants;
 import qz.common.TrayManager;
+import qz.installer.Installer;
 
 import javax.swing.*;
 import java.awt.*;
@@ -773,12 +774,26 @@ public static String calculateSaltedChallenge() {
     }
 
     private static long calculateChallenge() {
-        if(getJarPath() != null) {
-            if (getJarPath().toFile().exists()) {
-                return getJarPath().toFile().lastModified();
+        Path jarPath;
+        if(SystemUtilities.isJar()) {
+            jarPath = getJarPath();
+        } else {
+            // Running from IDE: Try to guess .jar location
+            if(SystemUtilities.isMac()) {
+                // 2.2+
+                jarPath = Paths.get(Installer.getInstance().getDestination(), "Contents", "Resources", Constants.PROPS_FILE + ".jar");
+                if(!jarPath.toFile().exists()) {
+                    // 2.1
+                    jarPath = Paths.get(Installer.getInstance().getDestination(), Constants.PROPS_FILE + ".jar");
+                }
+            } else {
+                jarPath = Paths.get(Installer.getInstance().getDestination(), Constants.PROPS_FILE + ".jar");
             }
         }
-        return -1L; // Fallback when running from IDE
+        if (jarPath.toFile().exists()) {
+            return jarPath.toFile().lastModified();
+        }
+        return -1L; // Fallback
     }
 
     /**