diff --git a/src/console/Screen.cpp b/src/console/Screen.cpp
index 2262b26..0d76470 100644
--- a/src/console/Screen.cpp
+++ b/src/console/Screen.cpp
@@ -21,7 +21,7 @@ static float s_consoleLines = 10.0f;
 static float s_fontHeight = 0.02f;
 static float s_consoleHeight = s_consoleLines * s_fontHeight;
 static char s_fontName[STORM_MAX_PATH];
-static int32_t s_highlightState;
+static HIGHLIGHTSTATE s_highlightState;
 static HLAYER s_layerBackground;
 static HLAYER s_layerText;
 static RECTF s_rect = { 0.0f, 1.0f, 1.0f, 1.0f };
@@ -77,7 +77,7 @@ void PaintBackground(void* param, const RECTF* rect, const RECTF* visible, float
     if (s_rect.bottom < 1.0f) {
         DrawBackground();
 
-        if (s_highlightState) {
+        if (s_highlightState != HS_NONE) {
             DrawHighLight();
         }
     }
diff --git a/src/console/Types.hpp b/src/console/Types.hpp
index bbb65be..8be7153 100644
--- a/src/console/Types.hpp
+++ b/src/console/Types.hpp
@@ -34,4 +34,11 @@ enum CONSOLERESIZESTATE {
     NUM_CONSOLERESIZESTATES,
 };
 
+enum HIGHLIGHTSTATE {
+    HS_NONE,
+    HS_HIGHLIGHTING,
+    HS_ENDHIGHLIGHT,
+    NUM_HIGHLIGHTSTATES
+};
+
 #endif