diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
index 6ff2bfa6b..e9e5c5ee3 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
@@ -19,6 +19,7 @@
 
 package org.isoron.uhabits.activities.habits.edit;
 
+import android.app.Dialog;
 import android.content.*;
 import android.os.*;
 import android.support.annotation.*;
@@ -117,6 +118,17 @@ public class EditHabitDialog extends AppCompatDialogFragment
         return view;
     }
 
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final Dialog dialog = super.onCreateDialog(savedInstanceState);
+        final Window window = dialog.getWindow();
+        if (window != null) {
+            window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        }
+        return dialog;
+    }
+
     protected int getTitle()
     {
         if (originalHabit != null) return R.string.edit_habit;
diff --git a/uhabits-android/src/main/res/layout/edit_habit.xml b/uhabits-android/src/main/res/layout/edit_habit.xml
index da5357c7b..4aa3c697e 100644
--- a/uhabits-android/src/main/res/layout/edit_habit.xml
+++ b/uhabits-android/src/main/res/layout/edit_habit.xml
@@ -17,62 +17,66 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<LinearLayout
-    android:id="@+id/container"
-    style="@style/dialogForm"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activities.habits.edit.EditHabitDialog"
-    tools:ignore="MergeRootFrame">
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
 
     <LinearLayout
-        android:id="@+id/formPanel"
-        style="@style/dialogFormPanel">
+        android:id="@+id/container"
+        style="@style/dialogForm"
+        tools:context=".activities.habits.edit.EditHabitDialog"
+        tools:ignore="MergeRootFrame">
 
-        <org.isoron.uhabits.activities.habits.edit.views.NameDescriptionPanel
-            android:id="@+id/namePanel"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+        <LinearLayout
+            android:id="@+id/formPanel"
+            style="@style/dialogFormPanel">
 
-        <org.isoron.uhabits.activities.habits.edit.views.FrequencyPanel
-            android:id="@+id/frequencyPanel"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            <org.isoron.uhabits.activities.habits.edit.views.NameDescriptionPanel
+                android:id="@+id/namePanel"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
-        <org.isoron.uhabits.activities.habits.edit.views.TargetPanel
-            android:id="@+id/targetPanel"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            <org.isoron.uhabits.activities.habits.edit.views.FrequencyPanel
+                android:id="@+id/frequencyPanel"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
-        <org.isoron.uhabits.activities.habits.edit.views.ReminderPanel
-            android:id="@+id/reminderPanel"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            <org.isoron.uhabits.activities.habits.edit.views.TargetPanel
+                android:id="@+id/targetPanel"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
-    </LinearLayout>
+            <org.isoron.uhabits.activities.habits.edit.views.ReminderPanel
+                android:id="@+id/reminderPanel"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
-    <LinearLayout
-        style="?android:attr/buttonBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="end"
-        android:paddingEnd="16dp"
-        android:paddingLeft="0dp"
-        android:paddingRight="16dp"
-        android:paddingStart="0dp">
+        </LinearLayout>
 
-        <Button
-            android:id="@+id/buttonDiscard"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            style="?android:attr/buttonBarStyle"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/discard"/>
+            android:gravity="end"
+            android:paddingStart="0dp"
+            android:paddingLeft="0dp"
+            android:paddingEnd="16dp"
+            android:paddingRight="16dp">
 
-        <Button
-            android:id="@+id/buttonSave"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/save"/>
+            <Button
+                android:id="@+id/buttonDiscard"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/discard" />
+
+            <Button
+                android:id="@+id/buttonSave"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/save" />
+        </LinearLayout>
     </LinearLayout>
-</LinearLayout>
+</ScrollView>
\ No newline at end of file