diff --git a/src/bin/edc_editor.c b/src/bin/edc_editor.c
index 0828e96..266fd0c 100644
--- a/src/bin/edc_editor.c
+++ b/src/bin/edc_editor.c
@@ -287,13 +287,17 @@ edit_template_insert(edit_data *ed)
    p[space] = '\0';
 
    int i;
-   for (i = 0; i < line_cnt; i++)
+   for (i = 0; i < (line_cnt - 1); i++)
      {
         elm_entry_entry_insert(ed->en_edit, p);
         elm_entry_entry_insert(ed->en_edit, t[i]);
+        //Incease line by (line count - 1)
         line_increase(ed);
      }
 
+   elm_entry_entry_insert(ed->en_edit, p);
+   elm_entry_entry_insert(ed->en_edit, t[i]);
+
    elm_entry_cursor_pos_set(ed->en_edit, cursor_pos);
 
    syntax_color_timer_update(ed);
@@ -363,13 +367,17 @@ edit_template_part_insert(edit_data *ed, Edje_Part_Type type)
      }
 
    int i;
-   for (i = 0; i < line_cnt; i++)
+   for (i = 0; i < (line_cnt - 1); i++)
      {
         elm_entry_entry_insert(ed->en_edit, p);
         elm_entry_entry_insert(ed->en_edit, t[i]);
+        //Incease line by (line count - 1)
         line_increase(ed);
      }
 
+   elm_entry_entry_insert(ed->en_edit, p);
+   elm_entry_entry_insert(ed->en_edit, t[i]);
+
    elm_entry_cursor_pos_set(ed->en_edit, cursor_pos);
 
    syntax_color_timer_update(ed);