diff --git a/data/ui/UberwriterWindow.ui b/data/ui/UberwriterWindow.ui
index 7b3f257..2bc9d2f 100644
--- a/data/ui/UberwriterWindow.ui
+++ b/data/ui/UberwriterWindow.ui
@@ -53,7 +53,7 @@
     <property name="tooltip_text" translatable="yes">Activate Regex</property>
     <property name="icon_name">find-location-symbolic</property>
   </object>
-  <object class="GtkApplicationWindow" id="uberwriter_window">
+  <object class="UberwriterWindow" id="uberwriter_window">
     <property name="can_focus">True</property>
     <property name="default_width">800</property>
     <property name="default_height">500</property>
diff --git a/uberwriter/UberwriterWindow.py b/uberwriter/UberwriterWindow.py
index bf502c6..174cdd6 100644
--- a/uberwriter/UberwriterWindow.py
+++ b/uberwriter/UberwriterWindow.py
@@ -72,7 +72,7 @@ CONFIG_PATH = os.path.expanduser("~/.config/uberwriter/")
 # See texteditor_lib.Window.py for more details about how this class works
 class UberwriterWindow(Window):
 
-    __gtype_name__ = "GtkApplicationWindow"
+    __gtype_name__ = "UberwriterWindow"
 
     __gsignals__ = {
         'save-file': (GObject.SIGNAL_ACTION, None, ()),
@@ -1002,7 +1002,7 @@ class UberwriterWindow(Window):
         self.TextEditor.props.width_request = 600
         self.TextEditor.props.halign = Gtk.Align.CENTER
         self.TextEditor.set_vadjustment(builder.get_object('vadjustment1'))
-        self.TextEditor.set_wrap_mode(Gtk.WrapMode.CHAR)
+        self.TextEditor.set_wrap_mode(Gtk.WrapMode.WORD)
         self.TextEditor.connect('focus-out-event', self.focus_out)
         self.TextEditor.get_style_context().connect('changed', self.style_changed)