diff --git a/e107_core/templates/navigation_template.php b/e107_core/templates/navigation_template.php
index fcf7d9e3b..f835996c8 100644
--- a/e107_core/templates/navigation_template.php
+++ b/e107_core/templates/navigation_template.php
@@ -13,7 +13,7 @@ $NAVIGATION_TEMPLATE['main']['start'] = '<ul class="nav nav-pills">';
 // Main Link
 $NAVIGATION_TEMPLATE['main']['item'] = '
 	<li class="dropdown">
-		<a class="dropdown-toggle"  role="button" href="{LINK_URL}" >
+		<a class="dropdown-toggle"  role="button" href="{LINK_URL}"{LINK_OPEN}>
 		 {LINK_ICON}{LINK_NAME} 
 		</a> 
 	</li>
@@ -42,7 +42,7 @@ $NAVIGATION_TEMPLATE['main']['item_submenu_active'] = '
 
 $NAVIGATION_TEMPLATE['main']['item_active'] = '
 	<li class="dropdown active">
-		<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}">
+		<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}"{LINK_OPEN}>
 		 {LINK_ICON} {LINK_NAME}
 		</a>
 	</li>
@@ -58,28 +58,28 @@ $NAVIGATION_TEMPLATE['main']['submenu_start'] = '
 
 $NAVIGATION_TEMPLATE['main']['submenu_item'] = '
 			<li role="menuitem" >
-				<a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a>
+				<a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>
 				{LINK_SUB}
 			</li>
 ';
 
 $NAVIGATION_TEMPLATE['main']['submenu_loweritem'] = '
 			<li role="menuitem" class="dropdown-submenu">
-				<a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a>
+				<a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>
 				{LINK_SUB}
 			</li>
 ';
 
 $NAVIGATION_TEMPLATE['main']['submenu_loweritem_active'] = '
 			<li role="menuitem" class="dropdown-submenu active">
-				<a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a>
+				<a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>
 				{LINK_SUB}
 			</li>
 ';
 
 $NAVIGATION_TEMPLATE['main']['submenu_item_active'] = '
 			<li role="menuitem" class="active">
-				<a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a>
+				<a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>
 				{LINK_SUB}
 			</li>
 ';
@@ -92,13 +92,13 @@ $NAVIGATION_TEMPLATE['main']['submenu_end'] = '</ul>';
 $NAVIGATION_TEMPLATE['side']['start'] 				= '<ul class="nav nav-list"><li class="nav-header">Sidebar</li>
 														';
 
-$NAVIGATION_TEMPLATE['side']['item'] 				= '<li><a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a></li>
+$NAVIGATION_TEMPLATE['side']['item'] 				= '<li><a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a></li>
 														';
 
 $NAVIGATION_TEMPLATE['side']['item_submenu'] 		= '<li class="nav-header">{LINK_ICON}{LINK_NAME}{LINK_SUB}</li>
 														';
 
-$NAVIGATION_TEMPLATE['side']['item_active'] 		= '<li class="active"><a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a></li>
+$NAVIGATION_TEMPLATE['side']['item_active'] 		= '<li class="active"{LINK_OPEN}><a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a></li>
 														';
 
 $NAVIGATION_TEMPLATE['side']['end'] 				= '</ul>
@@ -106,11 +106,11 @@ $NAVIGATION_TEMPLATE['side']['end'] 				= '</ul>
 
 $NAVIGATION_TEMPLATE['side']['submenu_start'] 		= '';
 
-$NAVIGATION_TEMPLATE['side']['submenu_item']		= '<li><a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a></li>';
+$NAVIGATION_TEMPLATE['side']['submenu_item']		= '<li><a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a></li>';
 
 $NAVIGATION_TEMPLATE['side']['submenu_loweritem'] = '
 			<li role="menuitem" class="dropdown-submenu">
-				<a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a>
+				<a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>
 				{LINK_SUB}
 			</li>
 ';
diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php
index 3b1e66bcc..7d4e906cb 100644
--- a/e107_handlers/sitelinks_class.php
+++ b/e107_handlers/sitelinks_class.php
@@ -1387,7 +1387,7 @@ class e_navigation
 		$ret 			= "";
 		
 		$sc->counter	= 1;
-		
+
 		foreach ($data as $_data) 
 		{		
 			$sc->setVars($_data);
@@ -1608,6 +1608,29 @@ class navigation_shortcodes extends e_shortcode
 		
 		return e107::getParser()->replaceConstants($url, 'full', TRUE);
 	}
+	
+	function sc_link_open($parm = '')
+	{
+		$type = $this->var['link_open'] ? (int) $this->var['link_open'] : 0;
+		
+		### 0 - same window, 1 - target blank, 4 - 600x400 popup, 5 - 800x600 popup
+		### TODO - JS popups (i.e. bootstrap)
+		switch($type)
+		{
+			case 1:
+				return ' target="_blank"';
+			break;
+			
+			case 4:
+				return " onclick=\"open_window('".$this->var['link_url']."',600,400); return false;\"";
+			break;
+			
+			case 5:
+				return " onclick=\"open_window('".$this->var['link_url']."',800,600); return false;\"";
+			break;
+		}
+		return '';
+	}
 
 	/**
 	 * @Deprecated - Use {LINK_ICON} instead.