Index: src/main/webapp/skins/workspaces/menuview.vm
===================================================================
--- src/main/webapp/skins/workspaces/menuview.vm	(revision 9835)
+++ src/main/webapp/skins/workspaces/menuview.vm	(working copy)
@@ -10,14 +10,8 @@
  #else
   <div id="leftmenu">
   #if($workspace)
-   #if($xwsmgr.applicationName=="Wiki")
-    #sidebarbuttons("Wiki") 
-   #elseif($xwsmgr.applicationName=="Blog")
-    #sidebarbuttons("Blog")
-   #elseif($xwsmgr.applicationName=="Photos")
-    #sidebarbuttons("Photos")
-   #elseif($xwsmgr.applicationName.equals("Files"))
-    #sidebarbuttons("Files")
+   #if($xwsmgr.applicationName && $xwsmgr.applicationName!="")
+    #sidebarbuttons($xwsmgr.applicationName) 
    #elseif($doc.space.equals($workspace.spaceName)) ## Space home buttons
     #if($workspace && $doc.name=="WebHome" && $doc.hasAccessLevel("edit") && (!$viewer || $viewer!="userdashboard"))
    <div class="webhomebuttons">