diff --git a/src/main/java/com/todoroo/andlib/data/DatabaseDao.java b/src/main/java/com/todoroo/andlib/data/DatabaseDao.java
index 3cea5cd70..2bc94a535 100644
--- a/src/main/java/com/todoroo/andlib/data/DatabaseDao.java
+++ b/src/main/java/com/todoroo/andlib/data/DatabaseDao.java
@@ -105,7 +105,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
         query.from(table);
         String queryString = query.toString();
         if (BuildConfig.DEBUG) {
-            Timber.d(queryString);
+            Timber.v(queryString);
         }
         Cursor cursor = database.rawQuery(queryString);
         return new TodorooCursor<>(cursor, query.getFields());
diff --git a/src/main/res/layout/fragment_comment_bar.xml b/src/main/res/layout/fragment_comment_bar.xml
index cf3186ab6..857e573b7 100644
--- a/src/main/res/layout/fragment_comment_bar.xml
+++ b/src/main/res/layout/fragment_comment_bar.xml
@@ -18,6 +18,8 @@
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_gravity="center_vertical"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:layout_weight="1"
         tools:ignore="ContentDescription" />
 
@@ -32,6 +34,8 @@
         android:hint="@string/TVA_add_comment"
         android:imeOptions="flagNoExtractUi|actionDone"
         android:inputType="textCapSentences"
+        android:nextFocusUp="@id/commentField"
+        android:nextFocusLeft="@id/commentField"
         android:textAlignment="viewStart"
         android:paddingLeft="@dimen/keyline_second"
         android:paddingStart="@dimen/keyline_second"