diff --git a/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java b/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java
index 082bbf9f31..eac4b0dcc2 100644
--- a/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java
+++ b/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java
@@ -209,11 +209,13 @@ public void bind(final Token token) {
     // ICON
     getTokenIconPanel().setImageId(token.getImageAssetId());
 
-    // NOTES
-    getGMNotesEditor().setText(token.getGMNotes());
+    // NOTES, GM NOTES. Due to the way things happen on different gui threads, the type must be set
+    // before the text
+    // otherwise the wrong values can get populated when the tab change listener fires.
     getGMNotesEditor().setTextType(token.getGmNotesType());
-    getPlayerNotesEditor().setText(token.getNotes());
+    getGMNotesEditor().setText(token.getGMNotes());
     getPlayerNotesEditor().setTextType(token.getNotesType());
+    getPlayerNotesEditor().setText(token.getNotes());
 
     // TYPE
     getTypeCombo().setSelectedItem(token.getType());