diff --git a/openstack_dashboard/dashboards/project/stacks/mappings.py b/openstack_dashboard/dashboards/project/stacks/mappings.py
index 5ce2620a37..b2daafa378 100644
--- a/openstack_dashboard/dashboards/project/stacks/mappings.py
+++ b/openstack_dashboard/dashboards/project/stacks/mappings.py
@@ -40,6 +40,8 @@ resource_urls = {
         'link': 'horizon:project:networks:detail'},
     "AWS::S3::Bucket": {
         'link': 'horizon:project:containers:index'},
+    "OS::Nova::Server": {
+        'link': 'horizon:project:instances:detail'},
     "OS::Quantum::Net": {
         'link': 'horizon:project:networks:detail'},
     "OS::Quantum::Port": {
diff --git a/openstack_dashboard/dashboards/project/stacks/templates/stacks/_resource_overview.html b/openstack_dashboard/dashboards/project/stacks/templates/stacks/_resource_overview.html
index cecfd2076c..1ae594dec2 100644
--- a/openstack_dashboard/dashboards/project/stacks/templates/stacks/_resource_overview.html
+++ b/openstack_dashboard/dashboards/project/stacks/templates/stacks/_resource_overview.html
@@ -12,9 +12,13 @@
   <dl>
     <dt>{% trans "Resource ID" %}</dt>
     <dd>
+      {% if resource_url %}
       <a href="{{ resource_url }}">
           {{ resource.physical_resource_id }}
       </a>
+      {% else %}
+      {{ resource.physical_resource_id }}
+      {% endif %}
     </dd>
   </dl>
   <dl>