diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp
index b9315d6a..fcfecaa5 100644
--- a/desktop_version/src/Graphics.cpp
+++ b/desktop_version/src/Graphics.cpp
@@ -609,15 +609,6 @@ void Graphics::drawgui()
     //Draw all the textboxes to the screen
     for (size_t i = 0; i<textbox.size(); i++)
     {
-        //This routine also updates the textboxs
-        textbox[i].update();
-        if (textbox[i].tm == 2 && textbox[i].tl <= 0.5)
-        {
-            textbox.erase(textbox.begin() + i);
-            i--;
-            continue;
-        }
-
         if (textbox[i].r == 0 && textbox[i].g == 0 && textbox[i].b == 0)
         {
             if(flipmode)
@@ -752,6 +743,21 @@ void Graphics::drawgui()
     }
 }
 
+void Graphics::updatetextboxes()
+{
+    for (size_t i = 0; i < textbox.size(); i++)
+    {
+        textbox[i].update();
+
+        if (textbox[i].tm == 2 && textbox[i].tl <= 0.5)
+        {
+            textbox.erase(textbox.begin() + i);
+            i--;
+            continue;
+        }
+    }
+}
+
 void Graphics::drawimagecol( int t, int xp, int yp, int r = 0, int g = 0, int b = 0, bool cent/*= false*/ )
 {
     if (!INBOUNDS(t, images))
diff --git a/desktop_version/src/Graphics.h b/desktop_version/src/Graphics.h
index e00fa4bd..62af7b22 100644
--- a/desktop_version/src/Graphics.h
+++ b/desktop_version/src/Graphics.h
@@ -97,6 +97,7 @@ public:
 
 	void drawimagecol(int t, int xp, int yp, int r, int g, int b, bool cent= false);
 
+	void updatetextboxes();
 	void drawgui();
 
 	void drawsprite(int x, int y, int t, int r, int g, int b);
diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp
index fd61bf1c..8163ba26 100644
--- a/desktop_version/src/Logic.cpp
+++ b/desktop_version/src/Logic.cpp
@@ -38,6 +38,7 @@ void maplogic()
 {
     //Misc
     help.updateglow();
+    graphics.updatetextboxes();
 }
 
 
@@ -1500,4 +1501,6 @@ void gamelogic()
     {
         obj.trophytext--;
     }
+
+    graphics.updatetextboxes();
 }
diff --git a/desktop_version/src/Textbox.cpp b/desktop_version/src/Textbox.cpp
index 92884360..90a8eb55 100644
--- a/desktop_version/src/Textbox.cpp
+++ b/desktop_version/src/Textbox.cpp
@@ -72,7 +72,7 @@ void textboxclass::update()
         if (tl <= 0.5)
         {
             tl = 0.5;
-            //this textbox will be removed by drawgui() later
+            //this textbox will be removed by updatetextboxes() later
         }
         setcol(int(tr * tl), int(tg * tl), int(tb * tl));
     }