diff --git a/src/main/java/betterquesting/client/gui2/editors/TextEditorFrame.java b/src/main/java/betterquesting/client/gui2/editors/TextEditorFrame.java
index 0b9ba2f26..acb3f19ce 100644
--- a/src/main/java/betterquesting/client/gui2/editors/TextEditorFrame.java
+++ b/src/main/java/betterquesting/client/gui2/editors/TextEditorFrame.java
@@ -24,20 +24,7 @@
 
 import javax.annotation.Nullable;
 import javax.imageio.ImageIO;
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.KeyStroke;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
 import javax.swing.border.TitledBorder;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
@@ -59,6 +46,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.TextFormatting;
+import org.apache.commons.lang3.SystemUtils;
 
 public class TextEditorFrame extends JFrame {
 
@@ -66,6 +54,24 @@ public class TextEditorFrame extends JFrame {
     private static final int defaultColumns = 60;
     private static BufferedImage logoCache = null;
 
+    // This fixes a crash on some environments by explicitly specifying the look and feel,
+    // And providing a backup (the cross platform one), if the system one fails.
+    static {
+        try {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        } catch (UnsupportedLookAndFeelException | ClassNotFoundException | InstantiationException |
+                 IllegalAccessException e) {
+            BetterQuesting.logger.fatal("Failed to set default look and feel, defaulting to cross platform... ", e);
+
+            try {
+                UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
+            } catch (UnsupportedLookAndFeelException | ClassNotFoundException | InstantiationException |
+                     IllegalAccessException e2) {
+                BetterQuesting.logger.fatal("Failed to set cross platform look and feel!", e2);
+            }
+        }
+    }
+
     // This is NOT a cache.
     // This contains windows that is open.
     // This makes it possible to show and remain multiple editor windows.
@@ -375,7 +381,11 @@ class UndoAction extends AbstractAction {
                 putValue(MNEMONIC_KEY, (int) 'U');
                 putValue(SHORT_DESCRIPTION, "Undo");
                 putValue(LONG_DESCRIPTION, "Undo");
-                putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('Z', InputEvent.CTRL_DOWN_MASK));
+
+                int modifierKeyCode;
+                if (SystemUtils.IS_OS_MAC) modifierKeyCode = InputEvent.META_DOWN_MASK;
+                else modifierKeyCode = InputEvent.CTRL_DOWN_MASK;
+                putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('Z', modifierKeyCode));
             }
 
             public void actionPerformed(ActionEvent e) {
@@ -393,7 +403,11 @@ class RedoAction extends AbstractAction {
                 putValue(MNEMONIC_KEY, (int) 'R');
                 putValue(SHORT_DESCRIPTION, "Redo");
                 putValue(LONG_DESCRIPTION, "Redo");
-                putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('Y', InputEvent.CTRL_DOWN_MASK));
+
+                int modifierKeyCode;
+                if (SystemUtils.IS_OS_MAC) modifierKeyCode = InputEvent.META_DOWN_MASK;
+                else modifierKeyCode = InputEvent.CTRL_DOWN_MASK;
+                putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('Y', modifierKeyCode));
             }
 
             public void actionPerformed(ActionEvent e) {