diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 760c19f3e722..c405e8694dee 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -262,7 +262,7 @@ vcs.log.recent.commits.count=1000
 vcs.log.open.another.log.visible=false
 
 vcs.executable.validator.timeout.sec=60
-vcs.unversioned.files.in.commit=false
+vcs.unversioned.files.in.commit=true
 
 psi.incremental.reparse.depth.limit=1000
 psi.deferIconLoading=true
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
index f9f6f87a7af7..0793b65c9013 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
@@ -83,7 +83,7 @@ public final class VcsConfiguration implements PersistentStateComponent<VcsConfi
   public boolean USE_COMMIT_MESSAGE_MARGIN = false;
   public int COMMIT_MESSAGE_MARGIN_SIZE = 72;
   public boolean WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN = false;
-  public boolean SHOW_UNVERSIONED_FILES_WHILE_COMMIT = false;
+  public boolean SHOW_UNVERSIONED_FILES_WHILE_COMMIT = true;
   public boolean LOCAL_CHANGES_DETAILS_PREVIEW_SHOWN = false;
 
   @AbstractCollection(surroundWithTag = false, elementTag = "path")