diff --git a/platform/platform-api/src/com/intellij/openapi/util/WindowStateService.java b/platform/platform-api/src/com/intellij/openapi/util/WindowStateService.java
index 605b3e0d717b..0da8575d144a 100644
--- a/platform/platform-api/src/com/intellij/openapi/util/WindowStateService.java
+++ b/platform/platform-api/src/com/intellij/openapi/util/WindowStateService.java
@@ -3,6 +3,7 @@ package com.intellij.openapi.util;
 
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.registry.Registry;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -33,7 +34,9 @@ public abstract class WindowStateService {
    * @return an instance of the service for the specified project
    */
   public static WindowStateService getInstance(@NotNull Project project) {
-    return project.getService(WindowStateService.class);
+    return Registry.is("ui.app.wide.dimension.service", false)
+           ? getInstance()
+           : project.getService(WindowStateService.class);
   }
 
 
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 1b2505723899..2d6e16eef8ce 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -1159,6 +1159,9 @@ wolf.the.problem.solver=true
 wolf.the.problem.solver.description=Disable 'global highlighting' to ease debug
 ui.disable.dimension.service.keys=false
 ui.disable.dimension.service.keys.description=Do not use remembered size and position for dialogs.
+ui.app.wide.dimension.service=false
+ui.app.wide.dimension.service.description=Store sizes and positions per-application instead of per-project
+
 
 ui.simplified=false
 # TODO: rewrite description after delete "ui.no.bangs.and.whistles"