diff --git a/astrid/res/layout/control_dialog_ok.xml b/astrid/res/layout/control_dialog_ok.xml
index c960176ce..7f7e7a881 100644
--- a/astrid/res/layout/control_dialog_ok.xml
+++ b/astrid/res/layout/control_dialog_ok.xml
@@ -2,7 +2,7 @@
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
 	    android:id="@+id/edit_dlg_ok"
 	    android:layout_width="150dip"
-	    android:layout_height="50dip"
+	    android:layout_height="45dip"
 	    android:layout_marginTop="10dip"
 	    android:layout_marginBottom="5dip"
 	    android:layout_weight="1"
diff --git a/astrid/res/layout/control_set_notes.xml b/astrid/res/layout/control_set_notes.xml
index 41571a308..6463712a3 100644
--- a/astrid/res/layout/control_set_notes.xml
+++ b/astrid/res/layout/control_set_notes.xml
@@ -6,34 +6,38 @@
   android:layout_height="fill_parent">
   
   <!-- notes -->
-  <LinearLayout
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_weight="100">
-    <!-- Voice Add Note Button -->
-    <ImageButton
-      android:id="@+id/voiceAddNoteButton"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:src="@android:drawable/ic_btn_speak_now"
-      android:scaleType="fitCenter"
-      android:visibility="gone" />
-    <EditText
-      android:id="@+id/notes"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginLeft="9dip"
-      android:layout_marginRight="9dip"
-      android:layout_weight="100"
-      android:scrollbars="vertical"
-      android:gravity="top"
-      android:hint="@string/TEA_notes_hint"
-      android:autoText="true"
-      android:capitalize="sentences"
-      android:singleLine="false"
-      android:freezesText="true" />
-  </LinearLayout>
+  <ScrollView
+      android:layout_width="fill_parent"
+   	  android:layout_height="wrap_content"
+      android:layout_weight="100">
+	  <LinearLayout
+	    android:orientation="horizontal"
+	    android:layout_width="fill_parent"
+	    android:layout_height="wrap_content">
+	    <!-- Voice Add Note Button -->
+	    <ImageButton
+	      android:id="@+id/voiceAddNoteButton"
+	      android:layout_width="wrap_content"
+	      android:layout_height="wrap_content"
+	      android:layout_weight="1"
+	      android:src="@android:drawable/ic_btn_speak_now"
+	      android:scaleType="fitCenter"
+	      android:visibility="gone" />
+	    <EditText
+	      android:id="@+id/notes"
+	      android:layout_width="wrap_content"
+	      android:layout_height="wrap_content"
+	      android:layout_marginLeft="9dip"
+	      android:layout_marginRight="9dip"
+	      android:layout_weight="100"
+	      android:scrollbars="vertical"
+	      android:gravity="top"
+	      android:hint="@string/TEA_notes_hint"
+	      android:autoText="true"
+	      android:capitalize="sentences"
+	      android:singleLine="false"
+	      android:freezesText="true" />
+	  </LinearLayout>
+  </ScrollView>
   <include layout="@layout/control_dialog_ok"/>
 </LinearLayout>
diff --git a/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java b/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
index c2e7a1312..4935e7d6b 100644
--- a/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
@@ -23,7 +23,7 @@ public class EditNotesControlSet extends PopupControlSet {
         editText = (EditText) getView().findViewById(R.id.notes);
         notesPreview = (TextView) getDisplayView().findViewById(R.id.notes_display);
         dialog.getWindow()
-              .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
+              .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
     }
 
     @Override