diff --git a/lib/WebGUI/Asset/WikiPage.pm b/lib/WebGUI/Asset/WikiPage.pm
index be1b20fde..b6f74069d 100644
--- a/lib/WebGUI/Asset/WikiPage.pm
+++ b/lib/WebGUI/Asset/WikiPage.pm
@@ -151,7 +151,7 @@ sub getEditForm {
 		formContent => WebGUI::Form::HTMLArea($session, { name => 'content', richEditId => $wiki->get('richEditor'), value => $self->get('content') }) ,
 		formSubmit => WebGUI::Form::submit($session, { value => 'Save' }),
 		formProtect => WebGUI::Form::yesNo($session, { name => "isProtected", value=>$self->getValue("isProtected")}),
-        formKeywords => WebGUI::Form::text($session, {
+        formKeywords => WebGUI::Form::keywords($session, {
             name    => "keywords",
             value   => WebGUI::Keyword->new($session)->getKeywordsForAsset({asset=>$self}),
             }),
diff --git a/lib/WebGUI/Form/Keywords.pm b/lib/WebGUI/Form/Keywords.pm
index d485c140d..92ebc12bd 100644
--- a/lib/WebGUI/Form/Keywords.pm
+++ b/lib/WebGUI/Form/Keywords.pm
@@ -99,9 +99,9 @@ sub toHtml {
     my $autocompleteDiv = $self->privateName('autocomplete');
     my $pageUrl = $url->page;
     my $output
-        = '<div class="yui-skin-sam webgui-keywords-autocomplete">' . $self->SUPER::toHtml
+        = '<div class="yui-skin-sam webgui-keywords-autocomplete"><div>' . $self->SUPER::toHtml
         . '<div id="' . $autocompleteDiv . '"></div>'
-        . '<script type="text/javascript">' . <<"END_SCRIPT" . '</script></div>';
+        . '<script type="text/javascript">' . <<"END_SCRIPT" . '</script></div></div>';
 (function() {
     var oDS = new YAHOO.util.XHRDataSource('$pageUrl');
     oDS.responseType = YAHOO.util.XHRDataSource.TYPE_JSON;