diff --git a/utils/themeeditor/editorwindow.ui b/utils/themeeditor/editorwindow.ui
index 21152dad75..b5e6c9d228 100644
--- a/utils/themeeditor/editorwindow.ui
+++ b/utils/themeeditor/editorwindow.ui
@@ -272,6 +272,13 @@
    </property>
   </action>
  </widget>
+ <tabstops>
+  <tabstop>fileTree</tabstop>
+  <tabstop>skinPreview</tabstop>
+  <tabstop>parseTree</tabstop>
+  <tabstop>fromTree</tabstop>
+  <tabstop>editorTabs</tabstop>
+ </tabstops>
  <resources>
   <include location="resources.qrc"/>
  </resources>
diff --git a/utils/themeeditor/skindocument.cpp b/utils/themeeditor/skindocument.cpp
index 3fb7d4871b..aada24daac 100644
--- a/utils/themeeditor/skindocument.cpp
+++ b/utils/themeeditor/skindocument.cpp
@@ -54,6 +54,7 @@ bool SkinDocument::requestClose()
     {
         /* Spawning the "Are you sure?" dialog */
         QMessageBox confirm(this);
+        confirm.setWindowTitle(tr("Confirm Close"));
         confirm.setText(title + tr(" has been modified."));
         confirm.setInformativeText(tr("Do you want to save your changes?"));
         confirm.setStandardButtons(QMessageBox::Save | QMessageBox::Discard
@@ -109,21 +110,9 @@ void SkinDocument::codeChanged()
     model->changeTree(editor->document()->toPlainText().toAscii());
 
     if(editor->document()->toPlainText() != saved)
-    {
-        if(title.length() > 0 && title[title.length() - 1] != '*')
-        {
-            title.append('*');
-            emit titleChanged(title);
-        }
-    }
+        emit titleChanged(title + QChar('*'));
     else
-    {
-        if(title.length() > 0 && title[title.length() - 1] == '*')
-        {
-            title.chop(1);
-            emit titleChanged(title);
-        }
-    }
+        emit titleChanged(title);
 }
 
 void SkinDocument::save()