diff --git a/ChangeLog b/ChangeLog
index a0516594fd..c5dc547417 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ Unreleased Version 2.2.0-pre
  * Feature: Kinetic scrolling. This lets you click/tap/touch scrollable stuff and fling it around instead of using the scroll bars or wheel. Configurable in the preferences. Thanks again Verdrusk.
  * Fix: Make two-finger zoom and rotation not go completely crazy when the canvas is mirrored or flipped. Thanks BoyOnion for reporting.
  * Fix: Don't crash when picking a brush preset on Android. Thanks to zetalambo and VeeBeeArt for reporting.
+ * Fix: Selections finally no longer sometimes disappear when transforming them. Thanks to Spuzzy, Xan and xxxx for reporting.
 
 2023-08-26 Version 2.2.0-beta.7
  * Fix: Make classic brushes not go brighter when smudging into transparency. Thanks to cada for reporting.
diff --git a/src/libclient/tools/toolcontroller.cpp b/src/libclient/tools/toolcontroller.cpp
index 3de989dded..a315dd087c 100644
--- a/src/libclient/tools/toolcontroller.cpp
+++ b/src/libclient/tools/toolcontroller.cpp
@@ -198,15 +198,13 @@ void ToolController::setStabilizerUseBrushSampleCount(bool stabilizerUseBrushSam
 
 void ToolController::setModel(canvas::CanvasModel *model)
 {
-	if(m_model != model) {
-		m_model = model;
-		connect(
-			m_model->aclState(), &canvas::AclState::featureAccessChanged, this,
-			&ToolController::onFeatureAccessChange);
-		connect(
-			m_model, &canvas::CanvasModel::selectionChanged, this,
-			&ToolController::onSelectionChange);
-	}
+	m_model = model;
+	connect(
+		m_model->aclState(), &canvas::AclState::featureAccessChanged, this,
+		&ToolController::onFeatureAccessChange);
+	connect(
+		m_model, &canvas::CanvasModel::selectionChanged, this,
+		&ToolController::onSelectionChange);
 	emit modelChanged(model);
 }