diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorAdapter.kt
index 8e4526d2..11e42a90 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorAdapter.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorAdapter.kt
@@ -346,8 +346,10 @@ class EditorAdapter(
 
 				// Listener
 				layout.setOnClickListener {
-					delegate?.onRowSelected(this.currentPosition, row, layout.tag as Int)
-					setViewBackground(layout, true, true)
+					if ((dataSource as EditorViewModel).isEdited) {
+						delegate?.onRowSelected(this.currentPosition, row, layout.tag as Int)
+						setViewBackground(layout, true, true)
+					}
 				}
 
 			}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorFragment.kt
index b3288f8b..49e5bd7f 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorFragment.kt
@@ -72,8 +72,7 @@ class EditorFragment : RealmFragment(), RowRepresentableDelegate, KeyboardListen
 	companion object {
 
 		fun newInstance(id: String? = null, configurationId: String? = null, attached: Boolean = false): EditorFragment {
-			val fragment =
-				EditorFragment()
+			val fragment = EditorFragment()
 			val bundle = Bundle()
 			bundle.putSerializable(BundleKey.HAND_HISTORY_ID.value, id)
 			bundle.putSerializable(BundleKey.CONFIGURATION_ID.value, configurationId)
@@ -329,6 +328,7 @@ class EditorFragment : RealmFragment(), RowRepresentableDelegate, KeyboardListen
 	 */
 	private fun save() {
 		this.model.save(getRealm())
+		this.arguments?.putSerializable(BundleKey.HAND_HISTORY_ID.value, this.model.handHistory.id)
 	}
 
 	/***