diff --git a/dialogs/newsequencedialog.cpp b/dialogs/newsequencedialog.cpp
index 8f12077c6..47ead1336 100644
--- a/dialogs/newsequencedialog.cpp
+++ b/dialogs/newsequencedialog.cpp
@@ -20,16 +20,6 @@
 
 #include "newsequencedialog.h"
 
-#include "panels/panels.h"
-#include "panels/project.h"
-#include "timeline/sequence.h"
-#include "undo/undostack.h"
-#include "undo/undo.h"
-#include "timeline/clip.h"
-#include "panels/timeline.h"
-#include "project/media.h"
-#include "rendering/audio.h"
-
 #include <QVariant>
 #include <QVBoxLayout>
 #include <QComboBox>
@@ -40,6 +30,16 @@
 #include <QLineEdit>
 #include <QDialogButtonBox>
 
+#include "panels/panels.h"
+#include "panels/project.h"
+#include "timeline/sequence.h"
+#include "undo/undostack.h"
+#include "undo/undo.h"
+#include "timeline/clip.h"
+#include "panels/timeline.h"
+#include "project/media.h"
+#include "rendering/audio.h"
+
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
diff --git a/dialogs/texteditdialog.cpp b/dialogs/texteditdialog.cpp
index c1fb194b3..31c841906 100644
--- a/dialogs/texteditdialog.cpp
+++ b/dialogs/texteditdialog.cpp
@@ -213,24 +213,26 @@ void TextEditDialog::SetAlignmentFromProperty()
 
 void TextEditDialog::UpdateUIFromTextCursor()
 {
-  italic_button->setChecked(textEdit->fontItalic());
-  underline_button->setChecked(textEdit->fontUnderline());
-  font_list->setCurrentText(textEdit->fontFamily());
-  font_size->SetValue(textEdit->fontPointSize());
-  font_color->set_color(textEdit->textColor());
+  if (rich_text_) {
+    italic_button->setChecked(textEdit->fontItalic());
+    underline_button->setChecked(textEdit->fontUnderline());
+    font_list->setCurrentText(textEdit->fontFamily());
+    font_size->SetValue(textEdit->fontPointSize());
+    font_color->set_color(textEdit->textColor());
 
-  for (int i=0;i<font_weight->count();i++) {
-    if (font_weight->itemData(i).toInt() == textEdit->fontWeight()) {
-      font_weight->blockSignals(true);
-      font_weight->setCurrentIndex(i);
-      font_weight->blockSignals(false);
-      break;
+    for (int i=0;i<font_weight->count();i++) {
+      if (font_weight->itemData(i).toInt() == textEdit->fontWeight()) {
+        font_weight->blockSignals(true);
+        font_weight->setCurrentIndex(i);
+        font_weight->blockSignals(false);
+        break;
+      }
     }
-  }
 
-  Qt::Alignment align = textEdit->alignment();
-  left_align_button->setChecked(align == Qt::AlignLeft);
-  center_align_button->setChecked(align == Qt::AlignCenter);
-  right_align_button->setChecked(align == Qt::AlignRight);
-  justify_align_button->setChecked(align == Qt::AlignJustify);
+    Qt::Alignment align = textEdit->alignment();
+    left_align_button->setChecked(align == Qt::AlignLeft);
+    center_align_button->setChecked(align == Qt::AlignCenter);
+    right_align_button->setChecked(align == Qt::AlignRight);
+    justify_align_button->setChecked(align == Qt::AlignJustify);
+  }
 }