diff --git a/admin/panels/entry/admin.entry.list.php b/admin/panels/entry/admin.entry.list.php
index 9851132..d2d5e92 100755
--- a/admin/panels/entry/admin.entry.list.php
+++ b/admin/panels/entry/admin.entry.list.php
@@ -39,6 +39,7 @@ class admin_entry_list extends AdminPanelActionValidated {
 		// parameters for the list
 		// start offset and count (now defaults to 8...)
 
+		$this->smarty->assign('formtarget', strip_tags($_SERVER ['PHP_SELF']));
 		$this->smarty->assign('categories_all', entry_categories_get('defs'));
 		$this->smarty->assign('saved_flags', entry_flags_get());
 
@@ -46,8 +47,9 @@ class admin_entry_list extends AdminPanelActionValidated {
 
 		global $fpdb;
 
-		if (!empty($_REQUEST ['entry']))
+		if (!empty($_REQUEST ['entry'])) {
 			utils_redirect('admin.php?p=entry&action=write&entry=' . $_REQUEST ['entry']);
+		}
 
 		isset($_REQUEST ['m']) ? $params ['m'] = $_REQUEST ['m'] : null;
 		isset($_REQUEST ['y']) ? $params ['y'] = $_REQUEST ['y'] : null;
diff --git a/admin/panels/entry/admin.entry.list.tpl b/admin/panels/entry/admin.entry.list.tpl
index 25a3e16..52520ec 100755
--- a/admin/panels/entry/admin.entry.list.tpl
+++ b/admin/panels/entry/admin.entry.list.tpl
@@ -25,7 +25,7 @@
 
 <p>{$panelstrings.descr}</p>
 
-<form method="get" action="{$smarty.server.PHP_SELF}?p=entry">
+<form method="get" action="{$formtarget}?p=entry">
 <p> <input type="hidden" name="p" value="entry" /> </p>
 <fieldset><legend>{$panelstrings.filter}</legend>
 	<select name="category" class="alignleft">