diff --git a/code/DocumentationService.php b/code/DocumentationService.php
index 3234309..c21bb43 100755
--- a/code/DocumentationService.php
+++ b/code/DocumentationService.php
@@ -265,7 +265,7 @@ class DocumentationService {
 					
 					if($dir && !$ignored) {
 						// check to see if it has docs
-						$docs = Controller::join_links($dir, 'docs');
+						$docs = Director::baseFolder() . '/' . Controller::join_links($entity, 'docs');
 	
 						if(is_dir($docs)) {
 							self::register($entity, $docs, '', $entity, true);
diff --git a/code/controllers/DocumentationViewer.php b/code/controllers/DocumentationViewer.php
index fbb31e5..fc0f7db 100755
--- a/code/controllers/DocumentationViewer.php
+++ b/code/controllers/DocumentationViewer.php
@@ -759,7 +759,7 @@ class DocumentationViewer extends Controller {
 		$form = new Form($this, 'DocumentationSearchForm', $fields, $actions);
 		$form->disableSecurityToken();
 		$form->setFormMethod('get');
-		$form->setFormAction('home/DocumentationSearchForm');
+		$form->setFormAction(self::$link_base . 'DocumentationSearchForm');
 		
 		return $form;
 	}