diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp
index d8128a3622a..bb7a93a887e 100644
--- a/src/plugins/git/gitsubmiteditor.cpp
+++ b/src/plugins/git/gitsubmiteditor.cpp
@@ -96,6 +96,11 @@ GitSubmitEditorWidget *GitSubmitEditor::submitEditorWidget()
     return static_cast<GitSubmitEditorWidget *>(widget());
 }
 
+const GitSubmitEditorWidget *GitSubmitEditor::submitEditorWidget() const
+{
+    return static_cast<GitSubmitEditorWidget *>(widget());
+}
+
 void GitSubmitEditor::setCommitData(const CommitData &d)
 {
     GitSubmitEditorWidget *w = submitEditorWidget();
@@ -174,12 +179,12 @@ void GitSubmitEditor::updateFileModel()
 
 GitSubmitEditorPanelData GitSubmitEditor::panelData() const
 {
-    return const_cast<GitSubmitEditor*>(this)->submitEditorWidget()->panelData();
+    return submitEditorWidget()->panelData();
 }
 
 QByteArray GitSubmitEditor::fileContents() const
 {
-    const QString& text = const_cast<GitSubmitEditor*>(this)->submitEditorWidget()->descriptionText();
+    const QString &text = submitEditorWidget()->descriptionText();
 
     if (!m_commitEncoding.isEmpty()) {
         // Do the encoding convert, When use user-defined encoding
diff --git a/src/plugins/git/gitsubmiteditor.h b/src/plugins/git/gitsubmiteditor.h
index df809cc9173..ca6e0cf7f16 100644
--- a/src/plugins/git/gitsubmiteditor.h
+++ b/src/plugins/git/gitsubmiteditor.h
@@ -71,6 +71,7 @@ private slots:
 
 private:
     inline GitSubmitEditorWidget *submitEditorWidget();
+    inline const GitSubmitEditorWidget *submitEditorWidget() const;
 
     VcsBase::SubmitFileModel *m_model;
     QString m_commitEncoding;
diff --git a/src/plugins/vcsbase/submiteditorwidget.cpp b/src/plugins/vcsbase/submiteditorwidget.cpp
index 3fe2a078ba6..816a4ae5cb5 100644
--- a/src/plugins/vcsbase/submiteditorwidget.cpp
+++ b/src/plugins/vcsbase/submiteditorwidget.cpp
@@ -568,9 +568,7 @@ void SubmitEditorWidget::addSubmitFieldWidget(SubmitFieldWidget *f)
         QHBoxLayout *outerLayout = new QHBoxLayout;
         outerLayout->addLayout(d->m_fieldLayout);
         outerLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Ignored));
-        QBoxLayout *descrLayout = qobject_cast<QBoxLayout*>(d->m_ui.descriptionBox->layout());
-        Q_ASSERT(descrLayout);
-        descrLayout->addLayout(outerLayout);
+        d->m_ui.descriptionLayout->addLayout(outerLayout);
     }
     d->m_fieldLayout->addWidget(f);
     d->m_fieldWidgets.push_back(f);
diff --git a/src/plugins/vcsbase/submiteditorwidget.ui b/src/plugins/vcsbase/submiteditorwidget.ui
index ab37981bb2f..0111080e1af 100644
--- a/src/plugins/vcsbase/submiteditorwidget.ui
+++ b/src/plugins/vcsbase/submiteditorwidget.ui
@@ -29,7 +29,7 @@
       <property name="flat">
        <bool>true</bool>
       </property>
-      <layout class="QVBoxLayout" name="verticalLayout">
+      <layout class="QVBoxLayout" name="descriptionLayout">
        <item>
         <widget class="Utils::CompletingTextEdit" name="description">
          <property name="acceptRichText">