diff --git a/source/java/org/alfresco/repo/wiki/WikiServiceImpl.java b/source/java/org/alfresco/repo/wiki/WikiServiceImpl.java
index 0f8065f190..11e3d14d36 100644
--- a/source/java/org/alfresco/repo/wiki/WikiServiceImpl.java
+++ b/source/java/org/alfresco/repo/wiki/WikiServiceImpl.java
@@ -165,7 +165,7 @@ public class WikiServiceImpl implements WikiService
        page.setModifiedAt((Date)props.get(ContentModel.PROP_MODIFIED));
        
        // Now the wiki ones
-       page.setTitle((String)props.get(ContentModel.PROP_TITLE));
+       page.setTitle(((String)props.get(ContentModel.PROP_TITLE)).replaceAll(" ", "_"));
        
        // Finally, do the content
        String contents = preLoadedContents;