diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt
index ff743816b..67ad8ae2d 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt
@@ -24,7 +24,6 @@ import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
 import android.appwidget.AppWidgetManager.INVALID_APPWIDGET_ID
 import android.content.Intent
 import android.os.Bundle
-import android.widget.AbsListView.CHOICE_MODE_MULTIPLE
 import android.widget.ArrayAdapter
 import android.widget.Button
 import android.widget.ListView
@@ -34,7 +33,6 @@ import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.AndroidThemeSwitcher
 import org.isoron.uhabits.core.preferences.WidgetPreferences
 import org.isoron.uhabits.widgets.WidgetUpdater
-import java.util.ArrayList
 
 class BooleanHabitPickerDialog : HabitPickerDialog() {
     override fun shouldHideNumerical() = true
@@ -88,20 +86,12 @@ open class HabitPickerDialog : Activity() {
         with(listView) {
             adapter = ArrayAdapter(
                 context,
-                android.R.layout.simple_list_item_multiple_choice,
+                android.R.layout.simple_list_item_1,
                 habitNames
             )
-            choiceMode = CHOICE_MODE_MULTIPLE
-            itemsCanFocus = false
-        }
-        saveButton.setOnClickListener {
-            val selectedIds = mutableListOf<Long>()
-            for (i in 0..listView.count) {
-                if (listView.isItemChecked(i)) {
-                    selectedIds.add(habitIds[i])
-                }
+            setOnItemClickListener { parent, view, position, id ->
+                confirm(mutableListOf(habitIds[position]))
             }
-            confirm(selectedIds)
         }
     }
 
diff --git a/uhabits-android/src/main/res/layout/widget_configure_activity.xml b/uhabits-android/src/main/res/layout/widget_configure_activity.xml
index ac32d91e9..ba7053467 100644
--- a/uhabits-android/src/main/res/layout/widget_configure_activity.xml
+++ b/uhabits-android/src/main/res/layout/widget_configure_activity.xml
@@ -30,10 +30,4 @@
         android:layout_weight="1">
     </ListView>
 
-    <Button
-        android:id="@+id/buttonSave"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:text="@string/save"/>
-
 </LinearLayout>
\ No newline at end of file