diff --git a/ckan/templates/package/base.html b/ckan/templates/package/base.html
index da2d278e9f4..b51f78faaa6 100644
--- a/ckan/templates/package/base.html
+++ b/ckan/templates/package/base.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% set pkg = c.pkg_dict %}
+{% set pkg = c.pkg_dict or pkg_dict %}
 
 {% block breadcrumb_content_selected %} class="active"{% endblock %}
 
diff --git a/ckan/templates/package/new_resource.html b/ckan/templates/package/new_resource.html
index 40d8ed97c9e..13cce195453 100644
--- a/ckan/templates/package/new_resource.html
+++ b/ckan/templates/package/new_resource.html
@@ -8,6 +8,12 @@
 
 {% block subtitle %}{{ _('Add data to the dataset') }}{% endblock %}
 
+{% block breadcrumb_content_selected %}{% endblock %}
+{% block breadcrumb_content %}
+  {{ super() }}
+  <li class="active"><a href="#">{{ _('Add New Resource') }}</a></li>
+{% endblock %}
+
 {% block form %}{% snippet 'package/snippets/resource_form.html', data=data, errors=errors, error_summary=error_summary, include_metadata=false, pkg_name=pkg_name, stage=stage, allow_upload=g.ofs_impl and logged_in %}{% endblock %}
 
 {% block secondary_content %}