diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt
index 6ec84ade..fd31fb77 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt
@@ -190,9 +190,11 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 	/***
 	 * Configures a hand history with a [handSetup]
 	 */
-	fun configure(handSetup: HandSetup) {
+	fun configure(handSetup: HandSetup, keepPlayers: Boolean = false) {
 
-		this.playerSetups.removeAll(this.playerSetups)
+		if (!keepPlayers) {
+			this.playerSetups.removeAll(this.playerSetups)
+		}
 
 		handSetup.tableSize?.let { this.numberOfPlayers = it }
 		handSetup.ante?.let { this.ante = it }
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionList.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionList.kt
index cae80b2a..4e09f24a 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionList.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionList.kt
@@ -347,8 +347,9 @@ class ActionList(var listener: ActionListListener? = null) : ArrayList<ComputedA
 
 		val activePositions = activePositions(refIndex)
 
-		// Remove the reference position from acting, UNLESS it's the BB and players have called
-		if (!(referenceAction.action.type == Action.Type.POST_BB && getStreetNextCalls(refIndex).isNotEmpty())) {
+		// Remove the reference position from acting, UNLESS it's the BB/Straddle and players have called
+		val preflop = referenceAction.action.type == Action.Type.POST_BB || referenceAction.action.type == Action.Type.STRADDLE
+		if (!(preflop && getStreetNextCalls(refIndex).isNotEmpty())) {
 			activePositions.remove(refIndexPosition)
 		}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/EditorViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/EditorViewModel.kt
index 11f7b6ff..e1e07348 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/EditorViewModel.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/EditorViewModel.kt
@@ -916,7 +916,7 @@ class EditorViewModel : ViewModel(), RowRepresentableDataSource, CardCentralizer
 			this.handSetup.setStraddlePositions(this.firstStraddlePosition!!, positions)
 		}
 
-		this.handHistory.configure(this.handSetup) // restart initial setup
+		this.handHistory.configure(this.handSetup, true) // restart initial setup
 		this.sortedActions.load(this.handHistory) // recreate the sorted Actions
 		this.createRowRepresentation() // make the table rows