diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryActivity.kt
index 5b9a4d81..8d0d20b3 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryActivity.kt
@@ -30,7 +30,7 @@ class HandHistoryActivity : BaseActivity() {
 		ATTACHED("attached")
 	}
 
-	private var fragment: Fragment? = null
+	private var currentFragment: Fragment? = null
 
 	companion object {
 
@@ -97,7 +97,7 @@ class HandHistoryActivity : BaseActivity() {
 
 		val fragment = HandHistoryFragment.newInstance(handHistoryId, sessionId, attached)
 		showFragment(fragment, R.id.container)
-		this.fragment = fragment
+		this.currentFragment = fragment
 	}
 
 	fun showReplayer(handHistoryId: String) {
@@ -106,12 +106,12 @@ class HandHistoryActivity : BaseActivity() {
 
 		val fragment = ReplayerFragment.newInstance(handHistoryId)
 		showFragment(fragment, R.id.container)
-		this.fragment = fragment
+		this.currentFragment = fragment
 	}
 
 	override fun onBackPressed() {
 
-		val shouldShowDataLossWarning = ((this.fragment as? HandHistoryFragment)?.isEditing == true)
+		val shouldShowDataLossWarning = ((this.currentFragment as? HandHistoryFragment)?.isEditing == true)
 
 		if (shouldShowDataLossWarning) {
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
index 0f6f736c..4b407a90 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
@@ -214,12 +214,9 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
 		val iconResId = if (this.model.isEdited) R.drawable.ic_check else R.drawable.ic_edit
 
 		this.menu?.let { menu ->
-			menu.findItem(R.id.edit_save)?.let {
-//				it.setTitle(titleResId)
-				it.setIcon(iconResId)
-			}
+			menu.findItem(R.id.edit_save).setIcon(iconResId)
 			this.replayerItem = menu.findItem(R.id.replayer)
-			this.replayerItem?.isEnabled = this.model.handHistory.isManaged
+			this.replayerItem?.isEnabled = !this.model.isEdited
 //			Timber.d("this.replayerItem = ${this.replayerItem}")
 		}
 	}