diff --git a/mousepad/mousepad-encoding-dialog.c b/mousepad/mousepad-encoding-dialog.c
index 5c17f14..95ec387 100644
--- a/mousepad/mousepad-encoding-dialog.c
+++ b/mousepad/mousepad-encoding-dialog.c
@@ -202,8 +202,12 @@ mousepad_encoding_dialog_init (MousepadEncodingDialog *dialog)
   gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (dialog->document), TRUE, TRUE, 0);
   gtk_text_view_set_editable (GTK_TEXT_VIEW (dialog->document->textview), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (dialog->document->textview), FALSE);
-  gtk_source_view_set_show_line_numbers (GTK_SOURCE_VIEW (dialog->document->textview), FALSE);
-  mousepad_view_set_word_wrap (dialog->document->textview, FALSE);
+
+  /* Do not configure the view - this triggers an invalid save of the settings,
+   * potentially overwriting user configuration */
+  /*gtk_source_view_set_show_line_numbers (GTK_SOURCE_VIEW (dialog->document->textview), FALSE);
+  mousepad_view_set_word_wrap (dialog->document->textview, FALSE);*/
+
   gtk_widget_show (GTK_WIDGET (dialog->document));
 }