diff --git a/.gitattributes b/.gitattributes
index 1d559651771..536f74c455f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1343,8 +1343,6 @@ forge-gui-mobile/src/forge/toolbox/ListChooser.java -text
 forge-gui-mobile/src/forge/util/LayoutHelper.java -text
 forge-gui-mobile/src/forge/util/PhysicsObject.java -text
 forge-gui-mobile/src/forge/util/Utils.java -text
-forge-gui-mobile/src/forge/util/WaitCallback.java -text
-forge-gui-mobile/src/forge/util/WaitRunnable.java -text
 forge-gui/.classpath -text
 forge-gui/.project -text
 forge-gui/.settings/org.eclipse.core.resources.prefs -text
@@ -17306,6 +17304,8 @@ forge-gui/src/main/java/forge/util/IgnoringXStream.java -text
 forge-gui/src/main/java/forge/util/LineReader.java -text
 forge-gui/src/main/java/forge/util/MultiplexOutputStream.java svneol=native#text/plain
 forge-gui/src/main/java/forge/util/OperatingSystem.java -text
+forge-gui/src/main/java/forge/util/WaitCallback.java -text
+forge-gui/src/main/java/forge/util/WaitRunnable.java -text
 forge-gui/src/main/java/forge/util/XmlUtil.java -text
 forge-gui/src/main/java/forge/util/gui/SGuiChoose.java -text
 forge-gui/src/main/java/forge/util/gui/SGuiDialog.java -text
diff --git a/forge-gui-mobile/src/forge/util/WaitCallback.java b/forge-gui/src/main/java/forge/util/WaitCallback.java
similarity index 100%
rename from forge-gui-mobile/src/forge/util/WaitCallback.java
rename to forge-gui/src/main/java/forge/util/WaitCallback.java
diff --git a/forge-gui-mobile/src/forge/util/WaitRunnable.java b/forge-gui/src/main/java/forge/util/WaitRunnable.java
similarity index 79%
rename from forge-gui-mobile/src/forge/util/WaitRunnable.java
rename to forge-gui/src/main/java/forge/util/WaitRunnable.java
index 643ed1f9b9d..24235896053 100644
--- a/forge-gui-mobile/src/forge/util/WaitRunnable.java
+++ b/forge-gui/src/main/java/forge/util/WaitRunnable.java
@@ -1,7 +1,5 @@
 package forge.util;
 
-import com.badlogic.gdx.Gdx;
-
 import forge.FThreads;
 
 public abstract class WaitRunnable implements Runnable {
@@ -11,8 +9,8 @@ public abstract class WaitRunnable implements Runnable {
     private final Lock lock = new Lock();
 
     public void invokeAndWait() {
-        FThreads.assertExecutedByEdt(false);
-        Gdx.app.postRunnable(new Runnable() {
+        FThreads.assertExecutedByEdt(false); //not supported if on UI thread
+        FThreads.invokeInEdtLater(new Runnable() {
             @Override
             public void run() {
                 WaitRunnable.this.run();