diff --git a/portal-web/docroot/html/portlet/wiki/move_page.jsp b/portal-web/docroot/html/portlet/wiki/move_page.jsp
index 4b0e5dbd0266e9e9aedc096bf606e48d6cd52f90..bfa7e2e0550964999296a5837f1717067fead7fe 100644
--- a/portal-web/docroot/html/portlet/wiki/move_page.jsp
+++ b/portal-web/docroot/html/portlet/wiki/move_page.jsp
@@ -37,7 +37,7 @@ String newTitle = ParamUtil.get(request, "newTitle", StringPool.BLANK);
 	<portlet:param name="struts_action" value="/wiki/move_page" />
 </portlet:actionURL>
 
-<aui:form action="<%= movePageURL %>" method="post" name="fm" onSubmit='<%= renderResponse.getNamespace() + "changeParent();" %>'>
+<aui:form action="<%= movePageURL %>" method="post" name="fm" onSubmit='<%= "event.preventDefault();" + renderResponse.getNamespace() + "changeParent();" %>'>
 	<aui:input name="<%= Constants.CMD %>" type="hidden" />
 	<aui:input name="redirect" type="hidden" value="<%= redirect %>" />
 	<aui:input name="nodeId" type="hidden" value="<%= node.getNodeId() %>" />
@@ -65,9 +65,7 @@ String newTitle = ParamUtil.get(request, "newTitle", StringPool.BLANK);
 			</div>
 
 			<aui:fieldset>
-				<aui:field-wrapper label="current-title">
-					<liferay-ui:input-resource url="<%= wikiPage.getTitle() %>" />
-				</aui:field-wrapper>
+				<aui:input name="currentTitle" type="resource" value="<%= wikiPage.getTitle() %>" />
 
 				<aui:input name="newTitle" value="<%= newTitle %>" />
 
@@ -117,9 +115,7 @@ String newTitle = ParamUtil.get(request, "newTitle", StringPool.BLANK);
 			%>
 
 			<aui:fieldset>
-				<aui:field-wrapper label="current-parent">
-					<liferay-ui:input-resource url="<%= parentText %>" />
-				</aui:field-wrapper>
+				<aui:input name="currentParent" type="resource" value="<%= parentText %>" />
 
 				<%
 				boolean newParentAvailable = true;
@@ -186,19 +182,19 @@ String newTitle = ParamUtil.get(request, "newTitle", StringPool.BLANK);
 
 <aui:script>
 	function <portlet:namespace />changeParent() {
-		document.<portlet:namespace />fm.<portlet:namespace /><%= Constants.CMD %>.value = "changeParent";
+		document.<portlet:namespace />fm.<portlet:namespace /><%= Constants.CMD %>.value = 'changeParent';
 
 		submitForm(document.<portlet:namespace />fm);
 	}
 
 	function <portlet:namespace />publishPage() {
-		document.<portlet:namespace />fm.<portlet:namespace />workflowAction.value = "<%= WorkflowConstants.ACTION_PUBLISH %>";
+		document.<portlet:namespace />fm.<portlet:namespace />workflowAction.value = '<%= WorkflowConstants.ACTION_PUBLISH %>';
 
 		<portlet:namespace />changeParent();
 	}
 
 	function <portlet:namespace />renamePage() {
-		document.<portlet:namespace />fm.<portlet:namespace /><%= Constants.CMD %>.value = "rename";
+		document.<portlet:namespace />fm.<portlet:namespace /><%= Constants.CMD %>.value = 'rename';
 
 		submitForm(document.<portlet:namespace />fm);
 	}
