diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 8cca982a47..d14392ad73 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -387,6 +387,8 @@ class acp_bbcodes
 
 		}
 		$db->sql_freeresult($result);
+		
+		$this->u_action = $this_u_action;
 	}
 
 	/*