diff --git a/ckan/templates/package/snippets/package_basic_fields.html b/ckan/templates/package/snippets/package_basic_fields.html
index f5620052f28..7bb19298712 100644
--- a/ckan/templates/package/snippets/package_basic_fields.html
+++ b/ckan/templates/package/snippets/package_basic_fields.html
@@ -38,3 +38,19 @@
 {% if data.group_id %}
   <input type="hidden" name="groups__0__id" value="{{ data.group_id }}" />
 {% endif %}
+{% if h.check_access('sysadmin') or data.get('state', 'draft').startswith('draft') or data.get('state', 'none') ==  'none' %}
+  {% set organizations_available = h.organizations_available() %}
+  {% if organizations_available %}
+    <div class="control-group">
+      <label for="field-organizations" class="control-label">{{ _('Organization') }}</label>
+      <div class="controls">
+        <select id="field-organizations" name="owner_org" data-module="autocomplete">
+          <option value="">{{ _('Select an organization...') }}</option>
+          {% for organization in organizations_available %}
+          <option value="{{ organization.id }}" {% if organization.id == data.owner_org%}selected="selected"{% endif %}>{{ organization.name }}</option>
+          {% endfor %}
+        </select>
+      </div>
+    </div>
+  {% endif %}
+{% endif %}
diff --git a/ckan/templates/package/snippets/package_metadata_fields.html b/ckan/templates/package/snippets/package_metadata_fields.html
index 04f9f0d3a42..8cc066e816e 100644
--- a/ckan/templates/package/snippets/package_metadata_fields.html
+++ b/ckan/templates/package/snippets/package_metadata_fields.html
@@ -1,21 +1,5 @@
 {% import 'macros/form.html' as form %}
 
-{% if h.check_access('sysadmin') or data.get('state', 'draft').startswith('draft') %}
-  {% set organizations_available = h.organizations_available() %}
-  {% if organizations_available %}
-    <div class="control-group">
-      <label for="field-organizations" class="control-label">{{ _('Organization') }}</label>
-      <div class="controls">
-        <select id="field-organizations" name="owner_org" data-module="autocomplete">
-          <option value="">{{ _('Select an organization...') }}</option>
-          {% for organization in organizations_available %}
-          <option value="{{ organization.id }}" {% if organization.id == data.owner_org%}selected="selected"{% endif %}>{{ organization.name }}</option>
-          {% endfor %}
-        </select>
-      </div>
-    </div>
-  {% endif %}
-{% endif %}
 
 {% if data.owner_org %}
   <div class="control-group">