--- old/src/java.desktop/share/classes/java/awt/EventQueue.java	2017-11-07 00:39:08.787132897 -0800
+++ new/src/java.desktop/share/classes/java/awt/EventQueue.java	2017-11-07 00:39:08.300126058 -0800
@@ -858,15 +858,13 @@
     private AWTEvent getCurrentEventImpl() {
         pushPopLock.lock();
         try {
-            if (fxAppThreadIsDispatchThread) {
+            if (Thread.currentThread() == dispatchThread
+                    || fxAppThreadIsDispatchThread) {
                 return (currentEvent != null)
                         ? currentEvent.get()
                         : null;
-            } else {
-                return (Thread.currentThread() == dispatchThread)
-                        ? currentEvent.get()
-                        : null;
             }
+            return null;
         } finally {
             pushPopLock.unlock();
         }