diff --git a/core/QuickAdd.vala b/core/QuickAdd.vala
index 4db616357..1377e89bb 100644
--- a/core/QuickAdd.vala
+++ b/core/QuickAdd.vala
@@ -146,7 +146,7 @@ public class Layouts.QuickAdd : Adw.Bin {
 		label_button.source = item.project.source;
 
 		reminder_button = new Widgets.ReminderPicker.ReminderButton (true) {
-			tooltip_markup = Util.get_default ().markup_accel_tooltip (_("Add Reminders"), "Ctrl+R"),
+			tooltip_markup = Util.get_default ().markup_accel_tooltip (_("Add Reminders"), "!"),
 		};
 
 		var action_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 12) {
diff --git a/core/Widgets/PinButton.vala b/core/Widgets/PinButton.vala
index 0d274d39a..a4cbf9ac9 100644
--- a/core/Widgets/PinButton.vala
+++ b/core/Widgets/PinButton.vala
@@ -38,11 +38,7 @@ public class Widgets.PinButton : Gtk.Button {
         pinned_image = new Gtk.Image.from_icon_name ("pin-symbolic");
         child = pinned_image;
 
-        var gesture = new Gtk.GestureClick ();
-        add_controller (gesture);
-
-        gesture.pressed.connect ((n_press, x, y) => {
-            gesture.set_state (Gtk.EventSequenceState.CLAIMED);
+        clicked.connect (() => {
             changed ();
         });
     }
diff --git a/src/Layouts/ItemRow.vala b/src/Layouts/ItemRow.vala
index 37ba0ccf7..d8ad09978 100644
--- a/src/Layouts/ItemRow.vala
+++ b/src/Layouts/ItemRow.vala
@@ -98,7 +98,7 @@ public class Layouts.ItemRow : Layouts.ItemBase {
 			_edit = value;
 
 			if (value) {
-				add_css_class ("row");
+				add_css_class ("no-selectable");
 				itemrow_box.add_css_class ("card");
 				itemrow_box.add_css_class ("card-selected");
 
@@ -131,7 +131,7 @@ public class Layouts.ItemRow : Layouts.ItemBase {
 					return GLib.Source.REMOVE;
 				});
 			} else {
-				remove_css_class ("row");
+				add_css_class ("no-selectable");
 				itemrow_box.remove_css_class ("card-selected");
 				itemrow_box.remove_css_class ("card");
 
@@ -199,10 +199,8 @@ public class Layouts.ItemRow : Layouts.ItemBase {
 	public ItemRow (Objects.Item item, bool is_project_view = false) {
 		Object (
 			item: item,
-			is_project_view: is_project_view,
-			focusable: false,
-			can_focus: true
-			);
+			is_project_view: is_project_view
+		);
 	}
 
 	~ItemRow () {
@@ -210,7 +208,7 @@ public class Layouts.ItemRow : Layouts.ItemBase {
 	}
 
 	construct {
-		css_classes = { "no-selectable", "no-padding" };
+		css_classes = { "row", "no-padding" };
 
 		project_id = item.project_id;
 		section_id = item.section_id;
@@ -616,6 +614,18 @@ public class Layouts.ItemRow : Layouts.ItemBase {
 			}
 		})] = handle_gesture_click;
 
+		activate.connect (() => {
+			if (Services.Settings.get_default ().settings.get_boolean ("open-task-sidebar")) {
+				Services.EventBus.get_default ().open_item (item);
+			} else {
+				if (Services.Settings.get_default ().settings.get_boolean ("attention-at-one")) {
+					Services.EventBus.get_default ().item_selected (item.id);
+				} else {
+					edit = true;
+				}
+			}
+		});
+
 		signals_map[Services.EventBus.get_default ().mobile_mode_change.connect (() => {
 			if (Services.EventBus.get_default ().mobile_mode) {
 				action_box_right.hexpand = false;