diff --git a/elm_code/lib/elm_code_widget.c b/elm_code/lib/elm_code_widget.c
index 52be408..16ea4e2 100644
--- a/elm_code/lib/elm_code_widget.c
+++ b/elm_code/lib/elm_code_widget.c
@@ -44,6 +44,12 @@ EAPI void elm_code_widget_fill(Evas_Object *o, Elm_Code *code)
 
              chr++;
           }
+        for (; x < (unsigned int) w; x++)
+          {
+             cells[x].codepoint = 0;
+             cells[x].bg = line->status;
+             cells[x].fg = ELM_CODE_TOKEN_TYPE_DEFAULT;
+          }
      }
 
    evas_object_textgrid_update_add(o, 0, 0, w, h);
@@ -79,6 +85,12 @@ _elm_code_widget_line_cb(void *data, Eo *obj, const Eo_Event_Description *desc E
 
         chr++;
      }
+   for (; x < (unsigned int) w; x++)
+     {
+        cells[x].codepoint = 0;
+        cells[x].bg = line->status;
+        cells[x].fg = ELM_CODE_TOKEN_TYPE_DEFAULT;
+     }
 
    evas_object_textgrid_update_add(o, 0, line->number - 1, w, 1);
 }