diff --git a/browser/concept_macros.pt b/browser/concept_macros.pt
index f3109df..eef5950 100644
--- a/browser/concept_macros.pt
+++ b/browser/concept_macros.pt
@@ -239,7 +239,7 @@
                 <tal:version tal:condition="view/useVersioning">
                   <td class="center"
                       tal:define="versionId related/versionId">
-                    <a href="#"
+                    <a tal:condition="not:related/versionable/notVersioned|nothing"
                        tal:content="versionId"
                        tal:omit-tag="python: versionId=='1.1'"
                        tal:define="url python: view.getUrlForTarget(related)"
diff --git a/browser/resource.py b/browser/resource.py
index bb69813..720f243 100644
--- a/browser/resource.py
+++ b/browser/resource.py
@@ -146,9 +146,9 @@ class ResourceView(BaseView):
                             subMacro=self.template.macros['related'],
                             priority=20, info=self)
             versionable = IVersionable(self.context, None)
-            if versionable is not None and len(versionable.versions) > 1:
+            if (versionable is not None and
+                not versionable.notVersioned and len(versionable.versions) > 1):
                     cont.macros.register('portlet_right', 'versions',
-                            #title=' '. join((_('Version'), versionable.versionId)),
                             title=_(u'Version ${versionId}',
                                     mapping=dict(versionId=versionable.versionId)),
                             subMacro=version_macros.macros['portlet_versions'],
diff --git a/expert/browser/search.pt b/expert/browser/search.pt
index f4b1fe6..4bcfc4d 100644
--- a/expert/browser/search.pt
+++ b/expert/browser/search.pt
@@ -129,7 +129,7 @@
                   <tal:version condition="view/useVersioning">
                     <td class="center"
                         tal:define="versionId row/versionId|string:">
-                      <a href="#"
+                      <a tal:condition="not:row/versionable/notVersioned|nothing"
                          tal:content="versionId"
                          tal:omit-tag="python: versionId and versionId=='1.1'"
                          tal:attributes="href