diff --git a/src/dawn/games/vn/components/VNTextboxScroller.cpp b/src/dawn/games/vn/components/VNTextboxScroller.cpp
index dd9c6e29..5569f531 100644
--- a/src/dawn/games/vn/components/VNTextboxScroller.cpp
+++ b/src/dawn/games/vn/components/VNTextboxScroller.cpp
@@ -89,7 +89,7 @@ int32_t VNTextboxScroller::getTotalQuadsToBeRevealed() {
   ) {
     quadsTotal += this->label->lines[i].quadCount;
   }
-  return quadsTotal;
+    return quadsTotal;
 }
 
 bool_t VNTextboxScroller::hasRevealedAllCurrentCharacters() {
diff --git a/src/dawn/scene/components/ui/text/UILabel.cpp b/src/dawn/scene/components/ui/text/UILabel.cpp
index 854d7ff1..2d8dd0ac 100644
--- a/src/dawn/scene/components/ui/text/UILabel.cpp
+++ b/src/dawn/scene/components/ui/text/UILabel.cpp
@@ -116,6 +116,7 @@ void UILabel::rebufferQuads(const std::vector<struct UILabelText> newTexts) {
   std::vector<std::pair<glm::vec4, glm::vec4>> vertices;
   struct FontShaderBufferData fontData;
   quadCountTotal = 0;
+  quadCount = -1;
   std::vector<struct UILabelText> realNewTexts;
 
   float_t maxWidth = this->width;
@@ -302,7 +303,8 @@ void UILabel::rebufferQuads(const std::vector<struct UILabelText> newTexts) {
 
     // Now we insert a line. We do this because there is no newline at the end
     // of the text, so we need to insert the last line manually.
-    fnInsertNewline(len);
+    bool_t isLast = itText == (newTexts.end() - 1);
+    if(isLast) fnInsertNewline(len);
 
     // Next
     ++partIndex;