diff --git a/app/.classpath b/app/.classpath
index 0b205ab3f..564649ea6 100644
--- a/app/.classpath
+++ b/app/.classpath
@@ -52,6 +52,6 @@
 	<classpathentry kind="lib" path="test-lib/fest-swing-1.2.jar"/>
 	<classpathentry kind="lib" path="test-lib/fest-util-1.1.2.jar"/>
 	<classpathentry kind="lib" path="test-lib/jcip-annotations-1.0.jar"/>
-	<classpathentry kind="lib" path="lib/jtouchbar-0.2.0-20180827.120213-5.jar"/>
+	<classpathentry kind="lib" path="lib/jtouchbar-1.0.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/app/lib/jtouchbar-0.2.0-20180827.120213-5.jar b/app/lib/jtouchbar-1.0.0.jar
similarity index 94%
rename from app/lib/jtouchbar-0.2.0-20180827.120213-5.jar
rename to app/lib/jtouchbar-1.0.0.jar
index eb3902a65..a6bf9a091 100644
Binary files a/app/lib/jtouchbar-0.2.0-20180827.120213-5.jar and b/app/lib/jtouchbar-1.0.0.jar differ
diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java
index 5dede700a..d37d0cc96 100644
--- a/app/src/processing/app/EditorToolbar.java
+++ b/app/src/processing/app/EditorToolbar.java
@@ -188,7 +188,15 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
       
       touchBarButtons[i] = new TouchBarButton();
       touchBarButtons[i].setImage(touchBarImages[i][ROLLOVER]);
-      touchBarButtons[i].setAction(event -> handleSelectionPressed(selection));
+      touchBarButtons[i].setAction(event -> {
+        // Run event handler later to prevent hanging if a dialog needs to be open
+        EventQueue.invokeLater(new Runnable() {
+          @Override
+          public void run() {
+            handleSelectionPressed(selection);
+          }
+        });
+      });
       
       TouchBarItem touchBarItem = new TouchBarItem(title[i], touchBarButtons[i], true);
       touchBarItem.setCustomizationLabel(title[i]);
diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml
index fb71d274a..654304f83 100644
--- a/build/windows/launcher/config.xml
+++ b/build/windows/launcher/config.xml
@@ -42,7 +42,7 @@
     <cp>%EXEDIR%/lib/jackson-module-mrbean-2.9.5.jar</cp>
     <cp>%EXEDIR%/lib/java-semver-0.8.0.jar</cp>
     <cp>%EXEDIR%/lib/jmdns-3.5.3.jar</cp>
-    <cp>%EXEDIR%/lib/jtouchbar-0.2.0-20180827.120213-5.jar</cp>
+    <cp>%EXEDIR%/lib/jtouchbar-1.0.0.jar</cp>
     <cp>%EXEDIR%/lib/slf4j-simple-1.7.22.jar</cp>
     <cp>%EXEDIR%/lib/slf4j-api-1.7.22.jar</cp>
     <cp>%EXEDIR%/lib/jna-4.2.2.jar</cp>
diff --git a/build/windows/launcher/config_debug.xml b/build/windows/launcher/config_debug.xml
index 2c407f428..86fd9560d 100644
--- a/build/windows/launcher/config_debug.xml
+++ b/build/windows/launcher/config_debug.xml
@@ -42,7 +42,7 @@
     <cp>%EXEDIR%/lib/jackson-module-mrbean-2.9.5.jar</cp>
     <cp>%EXEDIR%/lib/java-semver-0.8.0.jar</cp>
     <cp>%EXEDIR%/lib/jmdns-3.5.3.jar</cp>
-    <cp>%EXEDIR%/lib/jtouchbar-0.2.0-20180827.120213-5.jar</cp>
+    <cp>%EXEDIR%/lib/jtouchbar-1.0.0.jar</cp>
     <cp>%EXEDIR%/lib/slf4j-simple-1.7.22.jar</cp>
     <cp>%EXEDIR%/lib/slf4j-api-1.7.22.jar</cp>
     <cp>%EXEDIR%/lib/jna-4.2.2.jar</cp>