diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt
index e024b9a2..9e514fed 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt
@@ -175,5 +175,4 @@ open class Transaction : RealmObject(), Manageable, StaticRowRepresentableDataSo
 		return DefaultLegendValues(this.entryTitle(context), entryValue, totalStatValue, leftName = leftName)
 	}
 
-
 }
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionDataFragment.kt
index 78518743..579ef0ad 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionDataFragment.kt
@@ -43,7 +43,7 @@ class TransactionDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 	}
 
 	override fun adapterRows(): List<RowRepresentable>? {
-		return transaction.adapterRows()
+		return this.transaction.adapterRows()
 	}
 
 	override fun stringForRow(row: RowRepresentable): String {
@@ -93,12 +93,19 @@ class TransactionDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 
 	override fun onRowValueChanged(value: Any?, row: RowRepresentable) {
 		super.onRowValueChanged(value, row)
-		rowRepresentableAdapter.refreshRow(row)
+		this.rowRepresentableAdapter.refreshRow(row)
+		this.selectNextRow(row)
+	}
+
+	/***
+	 * Selects the next row to ease the data capture
+	 */
+	private fun selectNextRow(currentRow: RowRepresentable) {
 
-		if (viewModel.primaryKey == null) { // automatically change the row for new data
+		if (this.viewModel.primaryKey == null) {
 			GlobalScope.launch(Dispatchers.Main) {
 				delay(200)
-				when (row) {
+				when (currentRow) {
 					TransactionRow.BANKROLL -> onRowSelected(0, TransactionRow.TYPE)
 					TransactionRow.TYPE -> onRowSelected(0, TransactionRow.AMOUNT)
 //				TransactionRow.AMOUNT -> onRowSelected(0, TransactionRow.DATE)
@@ -106,6 +113,7 @@ class TransactionDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 				}
 			}
 		}
+
 	}
 
 	override fun willSaveData() {