diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java
index d91f63c5a..b2da09a40 100644
--- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java
+++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java
@@ -221,7 +221,7 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb
         // Set the scripting language for proper syntax highlighting
         // Use the container's language if available, otherwise fall back to handler's language
         String language = (container != null) ? container.getLanguage() : this.handler.getLanguage();
-      //  activeArea.setLanguage(language);
+      activeArea.setLanguage(language);
 
         // Set the script context for context-aware hook autocomplete
         activeArea.setScriptContext(getScriptContext());
diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java
index 5f3e590f0..99e6ce480 100644
--- a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java
@@ -448,6 +448,15 @@ public class GuiScriptTextArea extends GuiNpcTextField {
     public boolean fullscreen() {
         return GuiScriptInterface.isFullscreen;
     }
+
+    public void setLanguage(String language) {
+        if (this.container != null) {
+            // this.container.setLanguage(language);
+            if (this.enableCodeHighlighting) {
+                this.container.formatCodeText();
+            }
+        }
+    }
     // ==================== RENDERING ====================
     public void drawTextBox(int xMouse, int yMouse) {
         if (!visible)
@@ -2168,7 +2177,7 @@ public class GuiScriptTextArea extends GuiNpcTextField {
      */
     public void setScriptContext(ScriptContext context) {
         if (this.container != null) {
-            this.container.setScriptContext(context);
+            //  this.container.setScriptContext(context);
         }
     }
 
@@ -2178,7 +2187,8 @@ public class GuiScriptTextArea extends GuiNpcTextField {
      * @return The script context (NPC, PLAYER, BLOCK, ITEM, etc.)
      */
     public ScriptContext getScriptContext() {
-        return this.container != null ? this.container.getScriptContext() : ScriptContext.GLOBAL;
+        //   return this.container != null ? this.container.getScriptContext() : ScriptContext.GLOBAL;
+        return ScriptContext.GLOBAL;
     }
 
     public void setListener(ITextChangeListener listener) {