diff --git a/utils/themeeditor/parsetreenode.cpp b/utils/themeeditor/parsetreenode.cpp
index 3a5a63dcee..7530299870 100644
--- a/utils/themeeditor/parsetreenode.cpp
+++ b/utils/themeeditor/parsetreenode.cpp
@@ -116,10 +116,8 @@ QString ParseTreeNode::genCode() const
                 if(children[i]->element->type == TAG)
                     buffer.append(TAGSYM);
                 buffer.append(children[i]->genCode());
-                buffer.append('\n');
             }
-            if(children.count() == 0)
-                buffer.append('\n');
+            buffer.append('\n');
             break;
 
         case SUBLINES:
diff --git a/utils/themeeditor/skin_parser.c b/utils/themeeditor/skin_parser.c
index deb3a21ab2..94d059bfcc 100644
--- a/utils/themeeditor/skin_parser.c
+++ b/utils/themeeditor/skin_parser.c
@@ -114,6 +114,11 @@ struct skin_element* skin_parse_viewport(char** document)
         retval->children = skin_alloc_children(2);
         retval->children[0] = skin_alloc_element();
         skin_parse_tag(retval->children[0], &cursor);
+        if(*cursor == '\n')
+        {
+            cursor++;
+            skin_line++;
+        }
     }
     else
     {
@@ -185,8 +190,10 @@ struct skin_element* skin_parse_viewport(char** document)
             last = last->next;
 
         if(*cursor == '\n')
+        {
             cursor++;
-
+            skin_line++;
+        }
     }
 
     *document = cursor;