diff --git a/source/java/org/alfresco/web/bean/wcm/AVMConstants.java b/source/java/org/alfresco/web/bean/wcm/AVMConstants.java
index c1de34427f..9f06f564ca 100644
--- a/source/java/org/alfresco/web/bean/wcm/AVMConstants.java
+++ b/source/java/org/alfresco/web/bean/wcm/AVMConstants.java
@@ -70,5 +70,6 @@ public final class AVMConstants
    public final static String PROP_SANDBOX_AUTHOR_PREVIEW = ".sandbox.author.preview";
    public final static String PROP_DNS = ".dns.";
    public final static String PROP_WEBSITE_NAME = ".website.name";
+   public final static String PROP_SANDBOX_STORE_PREFIX = ".sandbox.store.";
    public final static String SPACE_ICON_WEBSITE = "space-icon-website";
 }
diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
index 46b844ae90..d3f34e5b77 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
@@ -353,6 +353,12 @@ public class CreateWebsiteWizard extends BaseWizardBean
             QName.createQName(null, AVMConstants.PROP_WEBSITE_NAME),
             new PropertyValue(DataTypeDefinition.TEXT, name));
       
+      // tag the store, oddly enough, with its own store name for querying.
+      // when will the madness end.
+      this.avmService.setStoreProperty(userStore,
+            QName.createQName(null, AVMConstants.PROP_SANDBOX_STORE_PREFIX + userStore),
+            new PropertyValue(DataTypeDefinition.TEXT, null));
+      
       // tag the store with the DNS name property
       tagStoreDNSPath(userStore);
       
@@ -373,6 +379,11 @@ public class CreateWebsiteWizard extends BaseWizardBean
             QName.createQName(null, AVMConstants.PROP_SANDBOX_AUTHOR_PREVIEW),
             new PropertyValue(DataTypeDefinition.TEXT, null));
       
+      // tag the store with its own store name for querying.
+      this.avmService.setStoreProperty(previewStore,
+            QName.createQName(null, AVMConstants.PROP_SANDBOX_STORE_PREFIX + previewStore),
+            new PropertyValue(DataTypeDefinition.TEXT, null));
+      
       // tag the store with the DNS name property
       tagStoreDNSPath(previewStore);