diff --git a/src/EditProfileDialog.ui b/src/EditProfileDialog.ui
--- a/src/EditProfileDialog.ui
+++ b/src/EditProfileDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>594</width>
-    <height>536</height>
+    <height>572</height>
    </rect>
   </property>
   <layout class="QHBoxLayout">
@@ -42,7 +42,7 @@
        <string comment="@title:tab Generic, common options">General</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
-       <item row="0" column="0">
+       <item row="1" column="0">
         <widget class="QGroupBox" name="groupBox_10">
          <property name="title">
           <string comment="@title:group Generic, common options">General</string>
@@ -104,27 +104,39 @@
              </spacer>
             </item>
             <item>
-             <widget class="QLabel" name="profileNameLabel">
-              <property name="text">
-               <string>Profile name:</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="profileNameEdit">
-              <property name="toolTip">
-               <string>A descriptive name for the profile</string>
-              </property>
-             </widget>
+             <layout class="QVBoxLayout" name="verticalLayout_2">
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout_13">
+                <item>
+                 <widget class="KMessageWidget" name="emptyNameWarningWidget"/>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout_12">
+                <item>
+                 <widget class="QLabel" name="profileNameLabel">
+                  <property name="text">
+                   <string>Profile name:</string>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLineEdit" name="profileNameEdit">
+                  <property name="toolTip">
+                   <string>A descriptive name for the profile</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
             </item>
            </layout>
           </item>
-          <item row="1" column="1">
-           <widget class="KMessageWidget" name="emptyNameWarningWidget"/>
-          </item>
           <item row="2" column="0">
            <widget class="QLabel" name="label_3">
             <property name="text">
@@ -222,7 +234,7 @@
          </layout>
         </widget>
        </item>
-       <item row="1" column="0">
+       <item row="2" column="0">
         <widget class="QGroupBox" name="groupBox_16">
          <property name="title">
           <string>Terminal Size</string>
@@ -327,7 +339,7 @@
          </layout>
         </widget>
        </item>
-       <item row="2" column="0">
+       <item row="3" column="0">
         <widget class="QGroupBox" name="groupBox_12">
          <property name="title">
           <string>Window</string>
@@ -349,7 +361,7 @@
          </layout>
         </widget>
        </item>
-       <item row="3" column="0">
+       <item row="4" column="0">
         <spacer>
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -577,10 +589,10 @@
                </sizepolicy>
               </property>
               <property name="text">
-               <string comment="KDE::DoNotExtract">KSqueezedTextLabel</string>
+               <string comment="KDE::DoNotExtract">…</string>
               </property>
-              <property name="textElideMode" stdset="0">
-               <string>Qt::ElideRight</string>
+              <property name="textElideMode">
+               <enum>Qt::ElideRight</enum>
               </property>
              </widget>
             </item>
@@ -1517,20 +1529,21 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>KPluralHandlingSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header>kpluralhandlingspinbox.h</header>
+  </customwidget>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
-   <class>KNS3::Button</class>
-   <extends>QPushButton</extends>
-   <header location="global">KNS3/Button</header>
-  </customwidget>
-  <customwidget>
-   <class>KPluralHandlingSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header>KPluralHandlingSpinBox</header>
+   <class>KMessageWidget</class>
+   <extends>QFrame</extends>
+   <header>kmessagewidget.h</header>
+   <container>1</container>
   </customwidget>
   <customwidget>
    <class>KColorButton</class>
@@ -1543,10 +1556,9 @@
    <header>ksqueezedtextlabel.h</header>
   </customwidget>
   <customwidget>
-   <class>KMessageWidget</class>
-   <extends>QFrame</extends>
-   <header location="global">kmessagewidget.h</header>
-   <container>1</container>
+   <class>KNS3::Button</class>
+   <extends>QPushButton</extends>
+   <header location="global">KNS3/Button</header>
   </customwidget>
   <customwidget>
    <class>Konsole::RenameTabWidget</class>