diff --git a/module/doc/ui/uploaddocs.html.php b/module/doc/ui/uploaddocs.html.php
index e4c632c326..d6948ee8c2 100644
--- a/module/doc/ui/uploaddocs.html.php
+++ b/module/doc/ui/uploaddocs.html.php
@@ -63,7 +63,6 @@ formPanel
         set::items($spaces),
         set::value($objectID),
         on::change('loadObjectModules'),
-        set::disabled($objectType == 'mine'),
         set::required(true)
     ) : null,
     formGroup
diff --git a/module/doc/zen.php b/module/doc/zen.php
index 1daa696ffe..96e8fcb11f 100644
--- a/module/doc/zen.php
+++ b/module/doc/zen.php
@@ -563,7 +563,7 @@ class docZen extends doc
 
         $this->view->title    = empty($lib) ? '' : zget($lib, 'name', '', $lib->name . $this->lang->hyphen) . $this->lang->doc->uploadDoc;
         $this->view->linkType = $objectType;
-        $this->view->spaces   = $this->getAllSpaces($objectType == 'custom' ? 'nomine' : 'onlymine');
+        $this->view->spaces   = ($objectType == 'mine' || $objectType == 'custom') ? $this->doc->getSubSpacesByType($objectType) : array();
     }
 
     /**