diff --git a/acp/portal_module.php b/acp/portal_module.php
index b18b9de3..8ef0538d 100644
--- a/acp/portal_module.php
+++ b/acp/portal_module.php
@@ -671,7 +671,7 @@ class portal_module
 							'MODULE_IMAGE'		=> ($row['module_image_src']) ? '<img src="' . $this->root_path . 'styles/' .  $this->user->style['style_path'] . '/theme/images/portal/' . $row['module_image_src'] . '" alt="' . $row['module_name'] . '" />' : '',
 							'MODULE_ENABLED'	=> ($row['module_status']) ? true : false,
 
-							'U_DELETE'			=> $this->get_module_link('modules', $row['module_id']) . '&amp;action=delete',
+							'U_DELETE'			=> $this->get_module_link('modules', $row['module_id']) . '&amp;action=delete&amp;module_classname=' . $row['module_classname'],
 							'U_EDIT'			=> $this->get_module_link('config', $row['module_id']),
 							'U_MOVE_UP'			=> $this->u_action . '&amp;module_id=' . $row['module_id'] . '&amp;action=move_up',
 							'U_MOVE_DOWN'		=> $this->u_action . '&amp;module_id=' . $row['module_id'] . '&amp;action=move_down',
diff --git a/tests/functional/portal_acp_test.php b/tests/functional/portal_acp_test.php
index 7740b794..828b9ad0 100644
--- a/tests/functional/portal_acp_test.php
+++ b/tests/functional/portal_acp_test.php
@@ -56,4 +56,23 @@ class phpbb_functional_portal_acp_test extends \board3\portal\tests\testframewor
 		$module_id = $output[1];
 		$crawler = self::request('GET', 'adm/index.php?i=\board3\portal\acp\portal_module&mode=modules&module_id=' . $module_id . '&action=move_down&sid=' . $this->sid);
 	}
+
+	public function test_delete_module()
+	{
+		$crawler = self::request('GET', 'adm/index.php?i=\board3\portal\acp\portal_module&mode=modules&sid=' . $this->sid);
+		$module_link = str_replace(array('./../', '%5C'), array('', '\\'), $crawler->filter('table')->eq(3)->filter('tr')->last()->filter('a')->eq(3)->attr('href'));
+		$crawler = self::request('GET', $module_link);
+		preg_match('/module_classname=(?:([a-z0-9\\\_]+))/', $module_link, $module_name);
+		$module_name = $module_name[1];
+		$this->assertContains('Are you sure you wish to delete the module', $crawler->text());
+		$form = $crawler->selectButton('confirm')->form();
+		$crawler = self::submit($form);
+		$this->assertContains('The module was removed successfully.', $crawler->text());
+
+		// Add it back
+		$crawler = self::request('GET', 'adm/index.php?i=\board3\portal\acp\portal_module&mode=modules&add[center]=true&sid=' . $this->sid);
+		$form = $crawler->selectButton('submit')->form();
+		$form->setValues(array('module_classname' => $module_name));
+		$crawler = self::submit($form);
+	}
 }