diff --git a/astrid/res/layout/control_set_reminders.xml b/astrid/res/layout/control_set_reminders.xml
index 38a5b6f0b..f66067d58 100644
--- a/astrid/res/layout/control_set_reminders.xml
+++ b/astrid/res/layout/control_set_reminders.xml
@@ -61,15 +61,40 @@
 		          android:layout_width="fill_parent"
 		          android:layout_height="wrap_content" />
 		      </LinearLayout>
-		      <TextView
-		        android:layout_width="wrap_content"
-		        android:layout_height="wrap_content"
-		        android:text="@string/TEA_reminder_alarm_label"
-		        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
-		      <com.todoroo.astrid.ui.ErrorCatchingSpinner
-		        android:id="@+id/reminder_alarm"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content" />
+		      <View
+		          android:id="@+id/TEA_Separator"
+		          android:layout_width="fill_parent"
+		          android:layout_height="1px"
+		          style="@style/TEA_Separator" />
+		      <LinearLayout
+		          android:id="@+id/reminder_alarm_container"
+		          android:layout_width="fill_parent"
+		          android:layout_height="50dip"
+		          android:gravity="center_vertical"
+		          android:orientation="horizontal">
+			      <TextView
+			        android:layout_width="wrap_content"
+			        android:layout_height="wrap_content"
+			        android:text="@string/TEA_reminder_alarm_label"
+			        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
+			      <TextView
+		             android:id="@+id/reminder_alarm_display"
+		             android:layout_width="fill_parent"
+		             android:layout_height="wrap_content"
+		             android:layout_weight="1"
+		             android:gravity="right"
+		             android:paddingLeft="10dip"
+		             style="@style/TextAppearance.EditRowDisplay" />
+			      <com.todoroo.astrid.ui.ErrorCatchingSpinner
+			        android:id="@+id/reminder_alarm"
+			        android:layout_width="0dip"
+			        android:layout_height="wrap_content" />
+		      </LinearLayout>
+		      <View
+		          android:id="@+id/TEA_Separator"
+		          android:layout_width="fill_parent"
+		          android:layout_height="1px"
+		          style="@style/TEA_Separator" />
 		    
 		</LinearLayout>
 	</ScrollView>
diff --git a/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java b/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java
index 60888dc3a..00169f179 100644
--- a/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java
@@ -10,10 +10,14 @@ import java.util.List;
 
 import android.app.Activity;
 import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
+import android.widget.TextView;
 
 import com.timsu.astrid.R;
 import com.todoroo.astrid.alarms.AlarmControlSet;
@@ -28,6 +32,7 @@ import com.todoroo.astrid.data.Task;
 public class ReminderControlSet extends PopupControlSet {
     private CheckBox during, after;
     private Spinner mode;
+    private TextView modeDisplay;
     private LinearLayout remindersBody;
     private final List<View> extraViews;
 
@@ -81,7 +86,15 @@ public class ReminderControlSet extends PopupControlSet {
     protected void afterInflate() {
         during = (CheckBox) getView().findViewById(R.id.reminder_due);
         after = (CheckBox) getView().findViewById(R.id.reminder_overdue);
+        modeDisplay = (TextView) getView().findViewById(R.id.reminder_alarm_display);
         mode = (Spinner) getView().findViewById(R.id.reminder_alarm);
+        View modeContainer = getView().findViewById(R.id.reminder_alarm_container);
+        modeContainer.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mode.performClick();
+            }
+        });
 
         randomControlSet = new RandomReminderControlSet(activity, getView(), -1);
         alarmControl = new AlarmControlSet(activity, R.layout.control_set_alarms);
@@ -101,6 +114,20 @@ public class ReminderControlSet extends PopupControlSet {
         final ArrayAdapter<String> adapter = new ArrayAdapter<String>(
                 activity, android.R.layout.simple_spinner_item, list);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        mode.setOnItemSelectedListener(new OnItemSelectedListener() {
+
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view,
+                    int position, long id) {
+                modeDisplay.setText(adapter.getItem(position));
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+                // TODO Auto-generated method stub
+
+            }
+        });
         activity.runOnUiThread(new Runnable() {
             @Override
             public void run() {