diff --git a/artifacts/mods/gl_highlighting.int b/artifacts/mods/gl_highlighting.int
index 227443f6..138e3b52 100644
Binary files a/artifacts/mods/gl_highlighting.int and b/artifacts/mods/gl_highlighting.int differ
diff --git a/artifacts/mods/gl_highlighting.ssl b/artifacts/mods/gl_highlighting.ssl
index d71c824c..6b0b2871 100644
--- a/artifacts/mods/gl_highlighting.ssl
+++ b/artifacts/mods/gl_highlighting.ssl
@@ -104,7 +104,7 @@ procedure KeyPressHandler begin
             scanCode := get_sfall_arg,
             scanner, charges;
 
-   if scanCode == highlightKey and not(get_game_mode bwand (INTFACELOOT bwor BARTER)) then begin
+   if scanCode == highlightKey and not(get_game_mode bwand bwnot(COMBAT bwor PCOMBAT)) then begin
       if pressed then begin
          set_global_script_repeat(REPEAT_FRAMES);
          if motionScanner then begin
@@ -134,14 +134,16 @@ procedure KeyPressHandler begin
    end
 end
 
+// visual glitch fix, turn off highlight when entering combat
 procedure CombatTurnHandler begin
    if isHighlight then begin
       call ToggleHighlight(false);
    end
 end
 
+// visual glitch fix, turn off highlight when opening other interfaces
 procedure GameModeChangeHandler begin
-   if isHighlight and (get_game_mode bwand (INTFACELOOT bwor BARTER)) then begin
+   if isHighlight and (get_game_mode bwand bwnot(COMBAT bwor PCOMBAT)) then begin
       call ToggleHighlight(false);
    end
 end
@@ -175,7 +177,7 @@ procedure start begin
       register_hook_proc(HOOK_INVENTORYMOVE, InventoryMoveHandler);
       set_global_script_type(1);
    end else begin
-      if isHighlight and not(get_game_mode bwand (INTFACELOOT bwor BARTER)) then begin
+      if isHighlight and not(get_game_mode bwand bwnot(COMBAT bwor PCOMBAT)) then begin
          call ToggleHighlight(true);
       end
    end
diff --git a/artifacts/sfall_dat/sfall.dat b/artifacts/sfall_dat/sfall.dat
index f022a75e..f40cb85b 100644
Binary files a/artifacts/sfall_dat/sfall.dat and b/artifacts/sfall_dat/sfall.dat differ
diff --git a/artifacts/sfall_dat/sfall_ru.dat b/artifacts/sfall_dat/sfall_ru.dat
index 2781d24a..b9f914d4 100644
Binary files a/artifacts/sfall_dat/sfall_ru.dat and b/artifacts/sfall_dat/sfall_ru.dat differ
diff --git a/artifacts/sfall_dat/sfall_zh.dat b/artifacts/sfall_dat/sfall_zh.dat
index 98f574df..c8b3d6c7 100644
Binary files a/artifacts/sfall_dat/sfall_zh.dat and b/artifacts/sfall_dat/sfall_zh.dat differ