diff --git a/module/doc/css/selectlibtype.css b/module/doc/css/selectlibtype.css
index cbffff4aec..61649d1aea 100644
--- a/module/doc/css/selectlibtype.css
+++ b/module/doc/css/selectlibtype.css
@@ -1 +1,3 @@
 #lib_chosen.chosen-container .chosen-results {max-height: 100px;}
+.radio-inline+.radio-inline { margin-top: 0; margin-left: 0px;}
+.radio-inline {margin-right: 10px;}
diff --git a/module/doc/view/selectlibtype.html.php b/module/doc/view/selectlibtype.html.php
index 2e3f6c395b..11485c2825 100644
--- a/module/doc/view/selectlibtype.html.php
+++ b/module/doc/view/selectlibtype.html.php
@@ -62,20 +62,26 @@
  */
 function changeSpace()
 {
-    var space   = $('[name=space]:checked').val();
-    var docType = $('[name=type]:checked').val();
-    console.log();
+    var space = $('[name=space]:checked').val();
     $('.apiTypeTR').toggleClass('hidden', space != 'api');
     $('.projectTR').toggleClass('hidden', space != 'project');
     $('.productTR').toggleClass('hidden', space != 'product');
-    $('#typeapi').removeAttr('disabled');
-    $('#typedoc').removeAttr('disabled');
-    if(space == 'mine' || space == 'custom') $('#typeapi').attr('disabled', 'disabled');
-    if(space == 'api') $('#typedoc').attr('disabled', 'disabled');
+    $('#typedoc').toggleClass('hidden', space == 'api');
+    $('#typeapi').toggleClass('hidden', space == 'mine' || space == 'custom');
+    $('#typedoc').closest('.radio-inline').toggleClass('hidden', space == 'api');
+    $('#typeapi').closest('.radio-inline').toggleClass('hidden', space == 'mine' || space == 'custom');
+
+    var docType = $('[name=type]:not(.hidden):checked').val();
     if(space == 'project' && docType) $('#project').change();
     if(space == 'product' && docType) $('#product').change();
     if((space == 'mine' || space == 'custom') && docType) loadDocLibs(space, docType);
     if(space == 'api' && docType) changeApiType();
+
+    if(!docType)
+    {
+        $('[name=type]:not(.hidden):first').prop('checked', true);
+        changeDocType();
+    }
 }
 
 /**
@@ -102,40 +108,23 @@ function changeApiType()
  */
 function changeDocType()
 {
-    var docType = $('[name=type]:checked').val();
-    $('[name=space]').removeAttr('disabled');
+    var docType = $('[name=type]:not(.hidden):checked').val();
     $('.executionTH').removeClass('hidden');
     $('#executionBox').removeClass('hidden');
     if(docType == 'api')
     {
-        $('#spacemine').attr('disabled', 'disabled');
-        $('#spacecustom').attr('disabled', 'disabled');
         $('.executionTH').addClass('hidden');
         $('#executionBox').addClass('hidden');
         $('#project').attr('onchange', "loadObjectModules('project', this.value, '" + docType + "')");
     }
-    if(docType == 'doc')
+    else if(docType == 'doc')
     {
-        $('#spaceapi').attr('disabled', 'disabled');
         $('#project').attr('onchange', "loadExecutions(this.value)");
     }
     $('#product').attr('onchange', "loadObjectModules('product', this.value, '" + docType + "')");
 
     var space = $('[name=space]:checked').val();
-    if(space)
-    {
-        if(docType == 'doc' && space == 'api')
-        {
-            $('[name=space]:checked').prop('checked', false);
-            $('[name=space]:not(:disabled):first').prop('checked', true);
-        }
-        if(docType == 'api' && (space == 'mine' || space == 'custom'))
-        {
-            $('[name=space]:checked').prop('checked', false);
-            $('[name=space]:not(:disabled):first').prop('checked', true);
-        }
-        changeSpace();
-    }
+    if(space) changeSpace();
 
     $('#submit').removeAttr('disabled');
 }