diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
index e96e3728f..66be11f93 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
@@ -272,6 +272,8 @@ open class Task : RealmObject, Parcelable {
         dest.writeLong(this.dueDate?.time ?: -1)
         dest.writeString(this.specialTag)
         dest.writeString(this.id)
+        dest.writeInt(this.counterUp ?: 0)
+        dest.writeInt(this.counterDown ?: 0)
     }
 
     constructor()
@@ -306,6 +308,8 @@ open class Task : RealmObject, Parcelable {
         this.dueDate = if (tmpDuedate == -1L) null else Date(tmpDuedate)
         this.specialTag = `in`.readString()
         this.id = `in`.readString()
+        this.counterUp = `in`.readInt()
+        this.counterDown = `in`.readInt()
     }
 
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
index 46f629b78..f92391357 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
@@ -423,7 +423,7 @@ class TaskFormActivity : BaseActivity() {
     private fun dismissKeyboard() {
         val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
         val currentFocus = currentFocus
-        if (currentFocus != null) {
+        if (currentFocus != null && !habitAdjustPositiveStreakView.isFocused && !habitAdjustNegativeStreakView.isFocused) {
             imm?.hideSoftInputFromWindow(currentFocus.windowToken, 0)
         }
     }