diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index be1f06ba103c..f5cfbc9b7803 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -388,7 +388,7 @@ cvs.roots.refresh.uses.vfs=true
 cvs.roots.refresh.uses.vfs.description=Should CVS roots refresh after update use VFS
 vcs.add.remove.silent=true
 
-vcs.merge.toolwindows=false
+vcs.merge.toolwindows=true
 vcs.merge.toolwindows.description=Merges Changes and Version Control tool windows into one
 vcs.merge.toolwindows.restartRequired=true