diff --git a/app/src/main/res/layout/activity_text_editor.xml b/app/src/main/res/layout/activity_text_editor.xml
index 11c62c6..752f8b3 100644
--- a/app/src/main/res/layout/activity_text_editor.xml
+++ b/app/src/main/res/layout/activity_text_editor.xml
@@ -6,24 +6,27 @@
 
     <include android:id="@+id/toolbar" layout="@layout/toolbar"/>
 
-    <ScrollView
+    <HorizontalScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fillViewport="true">
 
-        <HorizontalScrollView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        <ScrollView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:fillViewport="true">
 
             <EditText
                 android:id="@+id/text_editor"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:gravity="top"
                 android:textSize="15sp"
                 android:background="@null"
                 android:padding="5dp"/>
 
-        </HorizontalScrollView>
+        </ScrollView>
 
-    </ScrollView>
+    </HorizontalScrollView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_text_editor_wrap.xml b/app/src/main/res/layout/activity_text_editor_wrap.xml
index 55e0396..9822ddf 100644
--- a/app/src/main/res/layout/activity_text_editor_wrap.xml
+++ b/app/src/main/res/layout/activity_text_editor_wrap.xml
@@ -8,12 +8,14 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fillViewport="true">
 
             <EditText
                 android:id="@+id/text_editor"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:gravity="top"
                 android:textSize="15sp"
                 android:background="@null"
                 android:padding="5dp"/>