diff --git a/module/doc/js/selectlibtype.ui.js b/module/doc/js/selectlibtype.ui.js
index a370c0cbed..654e9ffce2 100644
--- a/module/doc/js/selectlibtype.ui.js
+++ b/module/doc/js/selectlibtype.ui.js
@@ -132,6 +132,14 @@ window.loadObjectModulesForSelect = function(objectType, objectID)
         objectID   = $(`.modal-body input[name=project]`).val();
     }
 
+    let $libPicker = $('#selectLibTypeForm [name=lib]').zui('picker');
+    $libPicker.render({items: []});
+    $libPicker.$.setValue('');
+
+    let $modulePicker = $('#selectLibTypeForm [name="module"]').zui('picker');
+    $modulePicker.render({items: []});
+    $modulePicker.$.setValue('');
+
     if(!objectID || !objectType) return false;
 
     let docType = $('.modal-body .radio-primary [name=type]:not(.hidden):checked').val();
@@ -140,13 +148,8 @@ window.loadObjectModulesForSelect = function(objectType, objectID)
     const link = $.createLink('doc', 'ajaxGetModules', 'objectType=' + objectType + '&objectID=' + objectID + '&type=' + docType);
     $.getJSON(link, function(data)
     {
-        const $libPicker = $('#selectLibTypeForm [name=lib]').zui('picker');
         $libPicker.render({items: data.libs});
-        $libPicker.$.setValue('');
-
-        const $modulePicker = $('#selectLibTypeForm [name="module"]').zui('picker');
         $modulePicker.render({items: data.modules});
-        $modulePicker.$.setValue('');
     });
 }
 
diff --git a/module/doc/ui/create.text.html.php b/module/doc/ui/create.text.html.php
index e163ce44a2..12d67268ef 100644
--- a/module/doc/ui/create.text.html.php
+++ b/module/doc/ui/create.text.html.php
@@ -67,7 +67,7 @@ $basicInfoModal = modal
         set::width('1/2'),
         set::label($lang->doc->lib),
         set::required(true),
-        picker(set::name('lib'), set::items($libs), set::value($libID), set::required(true))
+        picker(set::name('lib'), set::items($libs), set::value(isset($libs[$libID]) ? $libID : ''), set::required(true))
     ),
     formGroup
     (