diff --git a/src/main/java/org/codelibs/fess/app/web/admin/plugin/AdminPluginAction.java b/src/main/java/org/codelibs/fess/app/web/admin/plugin/AdminPluginAction.java
index e0dc8ecc6..b641853ef 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/plugin/AdminPluginAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/plugin/AdminPluginAction.java
@@ -66,7 +66,7 @@ public class AdminPluginAction extends FessAdminAction {
         Artifact artifact = new Artifact(form.name, form.version, null);
         try {
             pluginHelper.deleteInstalledArtifact(artifact);
-            saveInfo(messages -> messages.addSuccessInstallPlugin(GLOBAL, artifact.getFileName()));
+            saveInfo(messages -> messages.addSuccessDeletePlugin(GLOBAL, artifact.getFileName()));
         } catch (Exception e) {
             logger.warn("Failed to delete " + artifact.getFileName(), e);
             saveError(messages -> messages.addErrorsFailedToDeletePlugin(GLOBAL, artifact.getFileName()));
@@ -81,7 +81,7 @@ public class AdminPluginAction extends FessAdminAction {
     }
 
     private HtmlResponse asListHtml() {
-        return asHtml(path_AdminPlugin_AdminPluginJsp);
+        return asHtml(path_AdminPlugin_AdminPluginJsp).useForm(DeleteForm.class);
     }
 
     private List<Map<String, String>> getAllAvailableArtifacts() {
diff --git a/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin.jsp b/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin.jsp
index 3f80892f2..ddf068244 100644
--- a/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin.jsp
@@ -24,8 +24,18 @@
             <div class="row">
                 <div class="col-md-12">
                     <div class="box box-primary">
+						<div class="box-header with-border">
+							<h3 class="box-title">
+								<la:message key="labels.crud_title_list" />
+							</h3>
+							<div class="btn-group pull-right">
+								<la:link href="installplugin" styleClass="btn btn-success btn-xs">
+									<em class="fa fa-plus"></em>
+									<la:message key="labels.crud_link_create" />
+								</la:link>
+							</div>
+						</div>
                         <!-- /.box-header -->
-
                         <div class="box-body">
                             <%-- Message --%>
                             <div>
@@ -54,7 +64,7 @@
                                                     <td>${f:h(artifact.version)}</td>
                                                     <td>
 
-                                                        <button type="button" class="btn btn-danger" name="delete"
+                                                        <button type="button" class="btn btn-danger btn-xs" name="delete"
                                                                 data-toggle="modal" data-target="#confirmToDelete"
                                                                 value="<la:message key="labels.crud_button_delete" />">
                                                             <em class="fa fa-trash"></em>
@@ -83,12 +93,16 @@
                                                                                 data-dismiss="modal">
                                                                             <la:message key="labels.crud_button_cancel" />
                                                                         </button>
+																		<la:form action="/admin/plugin/" styleClass="form-horizontal">
+																		<input type="hidden" name="name" value="${f:h(artifact.name)}">
+																		<input type="hidden" name="version" value="${f:h(artifact.version)}">
                                                                         <button type="submit" class="btn btn-outline btn-danger"
                                                                                 name="delete"
                                                                                 value="<la:message key="labels.crud_button_delete" />">
                                                                             <em class="fa fa-trash"></em>
                                                                             <la:message key="labels.crud_button_delete" />
                                                                         </button>
+                                                                        </la:form>
                                                                     </div>
                                                                 </div>
                                                             </div>