diff --git a/src/modules/mod_weblinks/mod_weblinks.xml b/src/modules/mod_weblinks/mod_weblinks.xml
index 2b730e9..264d6f8 100644
--- a/src/modules/mod_weblinks/mod_weblinks.xml
+++ b/src/modules/mod_weblinks/mod_weblinks.xml
@@ -132,8 +132,8 @@
 					layout="joomla.form.field.radio.switcher"
 					default="0"
 					>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
 				</field>
 
 				<field
@@ -143,8 +143,8 @@
 					layout="joomla.form.field.radio.switcher"
 					default="0"
 					>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
 				</field>
 
 				<field
@@ -154,8 +154,21 @@
 					layout="joomla.form.field.radio.switcher"
 					default="1"
 					>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="target"
+					type="list"
+					label="MOD_WEBLINKS_FIELD_TARGET_LABEL"
+					default="0"
+					validate="options"
+					>
+					<option value="0">JBROWSERTARGET_PARENT</option>
+					<option value="1">JBROWSERTARGET_NEW</option>
+					<option value="2">JBROWSERTARGET_POPUP</option>
+					<option value="3">JBROWSERTARGET_MODAL</option>
 				</field>
 			</fieldset>
 
diff --git a/src/modules/mod_weblinks/tmpl/default.php b/src/modules/mod_weblinks/tmpl/default.php
index 525b183..b815a3a 100644
--- a/src/modules/mod_weblinks/tmpl/default.php
+++ b/src/modules/mod_weblinks/tmpl/default.php
@@ -46,12 +46,12 @@ use Joomla\CMS\HTML\HTMLHelper;
 					{
 						case 1:
 							// Open in a new window
-							echo '<a href="' . $link . '" target="_blank" class="' . $menuclass . '" rel="nofollow">' .
+							echo '<a href="' . $link . '" target="_blank" class="weblinks_module_<?php echo $" rel="nofollow">' .
 								htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . '</a>';
 							break;
 						case 2:
 							// Open in a popup window
-							$attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=' . $this->escape($width) . ',height=' . $this->escape($height) . '';
+							$attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=' . htmlspecialchars($width, ENT_COMPAT, 'UTF-8') . ',height=' . htmlspecialchars($width, ENT_COMPAT, 'UTF-8') . '';
 							echo "<a href=\"$link\" onclick=\"window.open(this.href, 'targetWindow', '" . $attribs . "'); return false;\">" .
 								htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . '</a>';
 							break;
@@ -104,12 +104,14 @@ use Joomla\CMS\HTML\HTMLHelper;
 		{
 			case 1:
 				// Open in a new window
-				echo '<a href="' . $link . '" target="_blank" class="' . $menuclass . '" rel="nofollow">' .
+				echo '<a href="' . $link . '" target="_blank" class="mod-weblink-item' . $item->id . '" rel="nofollow">' .
 					htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . '</a>';
 				break;
 			case 2:
 				// Open in a popup window
-				$attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=' . $this->escape($width) . ',height=' . $this->escape($height) . '';
+				$width  = $item->params->get('width', 600);
+				$height = $item->params->get('height', 500);
+				$attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=' . htmlspecialchars($width, ENT_COMPAT, 'UTF-8') . ',height=' . htmlspecialchars($height, ENT_COMPAT, 'UTF-8') . '';
 				echo "<a href=\"$link\" onclick=\"window.open(this.href, 'targetWindow', '" . $attribs . "'); return false;\">" .
 					htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . '</a>';
 				break;