diff --git a/android/sdremote/res/layout/presentation_clockbar.xml b/android/sdremote/res/layout/presentation_clockbar.xml
index 4d5d028..524a007 100644
--- a/android/sdremote/res/layout/presentation_clockbar.xml
+++ b/android/sdremote/res/layout/presentation_clockbar.xml
@@ -73,15 +73,14 @@
         android:background="#DD4D4D4D"
         android:orientation="horizontal" >
 
-        <EditText
+        <AutoCompleteTextView
             android:id="@+id/clockbar_countdown_time"
             android:layout_width="0dip"
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:ems="10"
             android:inputType="time"
-            android:text="03:00" >
-        </EditText>
+            android:text="30:00" />
 
         <Button
             android:id="@+id/clockbar_countdown_button"
diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml
index a08edd1..41a6c60 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <string name="app_name">Impress Remote</string>
     <string name="menu_settings">Settings</string>
     <string name="title_activity_presentation">PresentationActivity</string>
@@ -50,5 +49,12 @@
     <string name="addserver_cancel">Cancel</string>
     <string name="reconnect_description1">Your connection has been dropped.</string>
     <string name="reconnect_description2">Attempting to reconnect…</string>
-
+    <string-array name="clockbar_defined_times">
+        <item>5:00</item>
+        <item>15:00</item>
+        <item>30:00</item>
+        <item>45:00</item>
+        <item>55:00</item>
+        <item>60:00</item>
+    </string-array>
 </resources>
diff --git a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index 0de6b32..90d1b08 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -39,6 +39,8 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 import android.widget.ToggleButton;
@@ -162,7 +164,7 @@ public class PresentationActivity extends SherlockFragmentActivity {
     @Override
     public boolean onCreateOptionsMenu(com.actionbarsherlock.view.Menu menu) {
         getSupportMenuInflater().inflate(R.menu.actionbar_presentation, menu);
-        mActionBarManager = new ActionBarManager();
+        mActionBarManager = new ActionBarManager(this);
         return true;
     }
 
@@ -226,7 +228,7 @@ public class PresentationActivity extends SherlockFragmentActivity {
 
         // ------- COUNTDOWN BAR
         private View mCountdownBar;
-        private EditText mCountdownEntry;
+        private AutoCompleteTextView mCountdownEntry;
         private Button mCountdownButton;
 
         private String aTimeFormat = getResources().getString(
@@ -243,7 +245,7 @@ public class PresentationActivity extends SherlockFragmentActivity {
             timerHandler.removeCallbacks(timerUpdateRunnable);
         }
 
-        public ActionBarManager() {
+        public ActionBarManager(Context context) {
 
             ActionBar aBar = getSupportActionBar();
             aBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
@@ -257,7 +259,7 @@ public class PresentationActivity extends SherlockFragmentActivity {
                             R.id.actionbar_time);
             mTimeLabel.setOnClickListener(this);
 
-            setupClockBar();
+            setupClockBar(context);
 
             getSupportFragmentManager().addOnBackStackChangedListener(this);
 
@@ -275,7 +277,7 @@ public class PresentationActivity extends SherlockFragmentActivity {
             }
         }
 
-        private void setupClockBar() {
+        private void setupClockBar(Context context) {
             // ClockBar
             LayoutInflater aInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             aInflater.inflate(R.layout.presentation_clockbar, mOuterLayout);
@@ -306,8 +308,13 @@ public class PresentationActivity extends SherlockFragmentActivity {
             mCountdownBar = mOuterLayout
                             .findViewById(R.id.clockbar_countdownbar);
 
-            mCountdownEntry = (EditText) mCountdownBar
+            mCountdownEntry = (AutoCompleteTextView) mCountdownBar
                             .findViewById(R.id.clockbar_countdown_time);
+            String[] defaultTimes = getResources().getStringArray(R.array.clockbar_defined_times);
+            ArrayAdapter<String> arrayAdapter =
+                new ArrayAdapter<String>(context, android.R.layout.simple_list_item_1, defaultTimes);
+            mCountdownEntry.setAdapter(arrayAdapter);
+
             mCountdownButton = (Button) mCountdownBar
                             .findViewById(R.id.clockbar_countdown_button);
             mCountdownButton.setOnClickListener(this);
@@ -485,7 +492,7 @@ public class PresentationActivity extends SherlockFragmentActivity {
 
         @Override
         public boolean onEditorAction(TextView tv, int aID, KeyEvent aEvent) {
-            if (aEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
+            if (aEvent != null && aEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
 
                 long aTime = 0;
                 try {