diff --git a/src/dialogs/titletemplatedialog.cpp b/src/dialogs/titletemplatedialog.cpp
index a5cd88f4a..4da84962b 100644
--- a/src/dialogs/titletemplatedialog.cpp
+++ b/src/dialogs/titletemplatedialog.cpp
@@ -1,94 +1,100 @@
 /*
 Copyright (C) 2016  Jean-Baptiste Mardelle <jb@kdenlive.org>
 This file is part of Kdenlive. See www.kdenlive.org.
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of
 the License or (at your option) version 3 or any later version
 accepted by the membership of KDE e.V. (or its successor approved
 by the membership of KDE e.V.), which shall act as a proxy
 defined in Section 14 of version 3 of the license.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "titletemplatedialog.h"
 #include "doc/kthumb.h"
 #include "kdenlivesettings.h"
 #include "utils/KoIconUtils.h"
 
 #include "klocalizedstring.h"
 #include <KComboBox>
 #include <QDir>
 #include <QStandardPaths>
 
 TitleTemplateDialog::TitleTemplateDialog(const QString &folder, QWidget *parent)
     : QDialog(parent)
 {
     m_view.setupUi(this);
     // Get the list of existing templates
     const QStringList filter = {QStringLiteral("*.kdenlivetitle")};
     const QString path = folder + QStringLiteral("/titles/");
 
     // Project templates
     QDir dir(path);
     const QStringList templateFiles = dir.entryList(filter, QDir::Files);
     for (const QString &fname : templateFiles) {
         m_view.template_list->comboBox()->addItem(fname, dir.absoluteFilePath(fname));
     }
 
     // System templates
     const QStringList titleTemplates = QStandardPaths::locateAll(QStandardPaths::AppDataLocation, QStringLiteral("titles/"), QStandardPaths::LocateDirectory);
 
     for (const QString &folderpath : titleTemplates) {
         QDir sysdir(folderpath);
         const QStringList filesnames = sysdir.entryList(filter, QDir::Files);
         for (const QString &fname : filesnames) {
             m_view.template_list->comboBox()->addItem(fname, sysdir.absoluteFilePath(fname));
         }
     }
 
     if (m_view.template_list->comboBox()->count() > 0) {
         m_view.buttonBox->button(QDialogButtonBox::Ok)->setFocus();
     }
     int current = m_view.template_list->comboBox()->findText(KdenliveSettings::selected_template());
     if (current > -1) {
         m_view.template_list->comboBox()->setCurrentIndex(current);
     }
     const QStringList mimeTypeFilters = {QStringLiteral("application/x-kdenlivetitle")};
     m_view.template_list->setFilter(mimeTypeFilters.join(' '));
     connect(m_view.template_list->comboBox(), static_cast<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this, &TitleTemplateDialog::updatePreview);
     updatePreview();
 }
 
 QString TitleTemplateDialog::selectedTemplate() const
 {
     QString textTemplate = m_view.template_list->comboBox()->itemData(m_view.template_list->comboBox()->currentIndex()).toString();
     if (textTemplate.isEmpty()) {
         textTemplate = m_view.template_list->comboBox()->currentText();
     }
     return textTemplate;
 }
 
 QString TitleTemplateDialog::selectedText() const
 {
     return m_view.description->toPlainText();
 }
 
+void TitleTemplateDialog::resizeEvent(QResizeEvent *event)
+{
+    updatePreview();
+    QWidget::resizeEvent(event);
+}
+
 void TitleTemplateDialog::updatePreview()
 {
     QString textTemplate = m_view.template_list->comboBox()->itemData(m_view.template_list->comboBox()->currentIndex()).toString();
     if (textTemplate.isEmpty()) {
         textTemplate = m_view.template_list->comboBox()->currentText();
     }
     QPixmap pix = KThumb::getImage(QUrl::fromLocalFile(textTemplate), m_view.preview->width());
     m_view.preview->setPixmap(pix);
     KdenliveSettings::setSelected_template(m_view.template_list->comboBox()->currentText());
 }
diff --git a/src/dialogs/titletemplatedialog.h b/src/dialogs/titletemplatedialog.h
index 3c5b8adbf..81bf551f2 100644
--- a/src/dialogs/titletemplatedialog.h
+++ b/src/dialogs/titletemplatedialog.h
@@ -1,43 +1,48 @@
 /*
 Copyright (C) 2016  Jean-Baptiste Mardelle <jb@kdenlive.org>
 This file is part of Kdenlive. See www.kdenlive.org.
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of
 the License or (at your option) version 3 or any later version
 accepted by the membership of KDE e.V. (or its successor approved
 by the membership of KDE e.V.), which shall act as a proxy
 defined in Section 14 of version 3 of the license.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef TITLETEMPLATEDIALOG_H
 #define TITLETEMPLATEDIALOG_H
 
 #include "ui_templateclip_ui.h"
 
+class QResizeEvent;
+
 class TitleTemplateDialog : public QDialog
 {
     Q_OBJECT
 
 public:
     explicit TitleTemplateDialog(const QString &folder, QWidget *parent = nullptr);
     QString selectedTemplate() const;
     QString selectedText() const;
 
+protected:
+    void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
+
 private:
     Ui::TemplateClip_UI m_view;
 
 private slots:
     void updatePreview();
 };
 
 #endif
diff --git a/src/ui/templateclip_ui.ui b/src/ui/templateclip_ui.ui
index c84009e57..13faa06bd 100644
--- a/src/ui/templateclip_ui.ui
+++ b/src/ui/templateclip_ui.ui
@@ -1,130 +1,123 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>TemplateClip_UI</class>
  <widget class="QDialog" name="TemplateClip_UI">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>680</width>
     <height>352</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Template</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1" colspan="2">
     <widget class="KUrlComboRequester" name="template_list">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
    <item row="1" column="0" colspan="3">
     <widget class="QGroupBox" name="text_box">
      <property name="title">
       <string>Text</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
        <widget class="QTextEdit" name="description"/>
       </item>
       <item row="0" column="1">
        <widget class="QLabel" name="preview">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="minimumSize">
          <size>
           <width>300</width>
           <height>0</height>
          </size>
         </property>
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="2" column="2">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>28</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QFrame</extends>
    <header>kurlrequester.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KUrlComboRequester</class>
    <extends>KUrlRequester</extends>
    <header>kurlrequester.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
    <receiver>TemplateClip_UI</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
     <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>TemplateClip_UI</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>