diff --git a/js/newsroom_menu.js b/js/components/newsroom-menu.js
similarity index 89%
rename from js/newsroom_menu.js
rename to js/components/newsroom-menu.js
index 860a135ae..2b82ad486 100644
--- a/js/newsroom_menu.js
+++ b/js/components/newsroom-menu.js
@@ -175,31 +175,28 @@ $(function()
 		},
 		_buildDismissAllSection: function()
 		{
-			return '<div class="ibo-popover-menu--section ibo-navigation-menu--notifications-dismiss-all" data-role="ibo-popover-menu--section"><a class="ibo-popover-menu--item" data-role="ibo-navigation-menu--notifications-dismiss-all" ><i class="fas fa-fw fa-check ibo-navigation-menu--notifications-dismiss-all--icon"></i>'+this.options.labels.mark_all_as_read+'</a><hr class="ibo-popover-menu--item ibo-popover-menu--separator"></div>';
+			return '<div class="ibo-popover-menu--section ibo-navigation-menu--notifications-dismiss-all" data-role="ibo-popover-menu--section"><a class="ibo-popover-menu--item" data-role="ibo-navigation-menu--notifications-dismiss-all" ><i class="fas fa-fw fa-check ibo-navigation-menu--notifications-dismiss-all--icon"></i>' + this.options.labels.mark_all_as_read + '</a><hr class="ibo-popover-menu--item ibo-popover-menu--separator"></div>';
 		},
-		_buildMessageSection: function()
-		{
+		_buildMessageSection: function () {
 			return '<div class="ibo-popover-menu--section ibo-navigation-menu--notifications--messages-section" data-role="ibo-popover-menu--section">';
 		},
-		_buildShowAllMessagesSection: function()
-		{
+		_buildShowAllMessagesSection: function () {
 			return '<div class="ibo-popover-menu--section ibo-navigation-menu--notifications--show-all-messages" data-role="ibo-popover-menu--section">';
 		},
-		_buildMessageItems: function(sId, sText, sImage, sStartDate, sProvider, sUrl, oConverter)
-		{
+		_buildMessageItems: function (sId, sText, sImage, sStartDate, sProvider, sUrl, sTarget, oConverter) {
 			var sNewMessageIndicator = '<div class="ibo-navigation-menu--notifications--item--new-message-indicator"></div>';
-			sImage = '<img class="ibo-navigation-menu--notifications--item--image" src="'+sImage+'"><i class="ibo-navigation-menu--notifications--item--image '+this.options.placeholder_image_icon+'"></i>';
+			sImage = '<img class="ibo-navigation-menu--notifications--item--image" src="' + sImage + '"><i class="ibo-navigation-menu--notifications--item--image ' + this.options.placeholder_image_icon + '"></i>';
 
 			var div = document.createElement("div");
 			div.textContent = sText;
 			var sDescription = div.innerHTML; // Escape HTML entities for XSS prevention
-			
-			var sRichDescription = '<div class="ibo-navigation-menu--notifications--item--content">' + oConverter.makeHtml(sDescription) +'</div>';
-			
-			var sBottomText = '<span class="ibo-navigation-menu--notifications--item--bottom-text">'+ sImage + '<span>' + this.options.providers[sProvider].label+'</span> <span> ' + moment(sStartDate).fromNow()+'</span></span>';
-			
-			return '<a class="ibo-popover-menu--item ibo-navigation-menu--notifications-item" data-role="ibo-navigation-menu--notifications-item" data-msg-id="'+sId+'" data-provider-id="'+sProvider+'" href="'+sUrl+'" target="_blank" id="newsroom_menu_item_'+sId+'">' +
-				sNewMessageIndicator + sRichDescription + sBottomText +'</a>';
+
+			var sRichDescription = '<div class="ibo-navigation-menu--notifications--item--content">' + oConverter.makeHtml(sDescription) + '</div>';
+
+			var sBottomText = '<span class="ibo-navigation-menu--notifications--item--bottom-text">' + sImage + '<span>' + this.options.providers[sProvider].label + '</span> <span> ' + moment(sStartDate).fromNow() + '</span></span>';
+
+			return '<a class="ibo-popover-menu--item ibo-navigation-menu--notifications-item" data-role="ibo-navigation-menu--notifications-item" data-msg-id="' + sId + '" data-provider-id="' + sProvider + '" href="' + sUrl + '" target="' + sTarget + '" id="newsroom_menu_item_' + sId + '">' +
+				sNewMessageIndicator + sRichDescription + sBottomText + '</a>';
 		},
 		_buildNoMessageItem: function()
 		{
@@ -208,21 +205,19 @@ $(function()
 		},
 		_buildSingleShowAllMessagesItem: function()
 		{
-			return '<a class="ibo-popover-menu--item" data-role="ibo-navigation-menu--notifications-show-all" href="'+this.options.providers[0].view_all_url+'">' + this.options.labels.view_all + '</a>';
+			return '<a class="ibo-popover-menu--item" data-role="ibo-navigation-menu--notifications-show-all" href="' + this.options.providers[0].view_all_url + '" target="' + this.options.providers[0].target + '">' + this.options.labels.view_all + '</a>';
 		},
 		_buildMultipleShowAllMessagesItem: function(aUnreadMessagesByProvider)
 		{
 			var sNewMessageIndicator = '<div class="ibo-navigation-menu--notifications--item--new-message-indicator"></div>';
 
 			var sUnreadMessages = ''
-			for(k in this.options.providers)
-			{
+			for(k in this.options.providers) {
 				var sExtraMessages = '';
-				if (aUnreadMessagesByProvider[k] > 0)
-				{
-					sExtraMessages = ' <span class="ibo-navigation-menu--notifications-show-all-multiple--counter">('+aUnreadMessagesByProvider[k]+')</span>'
+				if (aUnreadMessagesByProvider[k] > 0) {
+					sExtraMessages = ' <span class="ibo-navigation-menu--notifications-show-all-multiple--counter">(' + aUnreadMessagesByProvider[k] + ')</span>'
 				}
-				sUnreadMessages += '<a class="ibo-popover-menu--item" data-provider-id="'+k+'" href="'+this.options.providers[k].view_all_url+'" target="_blank">'+ sNewMessageIndicator +this.options.providers[k].label+sExtraMessages+'</a>';
+				sUnreadMessages += '<a class="ibo-popover-menu--item" data-provider-id="' + k + '" href="' + this.options.providers[k].view_all_url + '" target="' + this.options.providers[k].target + '">' + sNewMessageIndicator + this.options.providers[k].label + sExtraMessages + '</a>';
 			}
 			return '<a class="ibo-popover-menu--item ibo-navigation-menu--notifications-show-all-multiple" data-role="ibo-navigation-menu--notifications-show-all-multiple" href="#">'+this.options.labels.view_all+'<i class="fas fas-caret-down"></i></a>' +
 				'<div class="ibo-popover-menu" data-role="ibo-popover-menu"><div class="ibo-popover-menu--section" data-role="ibo-popover-menu--section">'+sUnreadMessages+'</div></div>';
@@ -247,9 +242,8 @@ $(function()
 			{
 				var oMessage = aAllMessages[k];
 				aUnreadMessagesByProvider[oMessage.provider]++;
-				if (iCount < this.options.display_limit + 4)
-				{
-					var sMessageItem = this._buildMessageItems(oMessage.id, oMessage.text, oMessage.image, oMessage.start_date, oMessage.provider, oMessage.url, oConverter)
+				if (iCount < this.options.display_limit + 4) {
+					var sMessageItem = this._buildMessageItems(oMessage.id, oMessage.text, oMessage.image, oMessage.start_date, oMessage.provider, oMessage.url, oMessage.target, oConverter)
 					sMessageSection += sMessageItem;
 				}
 				iCount++;
diff --git a/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php b/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php
index bcb43c82f..43d6046a7 100644
--- a/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php
+++ b/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php
@@ -23,6 +23,7 @@ use appUserPreferences;
 use Dict;
 use MetaModel;
 use UserRights;
+use utils;
 
 /**
 * Class NewsroomMenuFactory
@@ -66,15 +67,15 @@ class NewsroomMenuFactory
 		 * @var \iNewsroomProvider[] $aProviders
 		 */
 		$aProviders = MetaModel::EnumPlugins('iNewsroomProvider');
-		foreach($aProviders as $oProvider)
-		{
-			$oProvider->SetConfig(MetaModel::GetConfig());
-			$bProviderEnabled = appUserPreferences::GetPref('newsroom_provider_'.get_class($oProvider),true);
-			if ($bProviderEnabled && $oProvider->IsApplicable($oUser))
-			{
+		foreach($aProviders as $oProvider) {
+			$oConfig = MetaModel::GetConfig();
+			$oProvider->SetConfig($oConfig);
+			$bProviderEnabled = appUserPreferences::GetPref('newsroom_provider_'.get_class($oProvider), true);
+			if ($bProviderEnabled && $oProvider->IsApplicable($oUser)) {
 				$aProviderParams[] = array(
 					'label' => $oProvider->GetLabel(),
 					'fetch_url' => $oProvider->GetFetchURL(),
+					'target' => utils::StartsWith($oProvider->GetFetchURL(), $oConfig->Get('app_root_url')) ? '_self' : 'blank',
 					'view_all_url' => $oProvider->GetViewAllURL(),
 					'mark_all_as_read_url' => $oProvider->GetMarkAllAsReadURL(),
 					'placeholders' => $oProvider->GetPlaceholders(),
diff --git a/sources/application/WebPage/iTopWebPage.php b/sources/application/WebPage/iTopWebPage.php
index d31d522d5..8b4dbe74d 100644
--- a/sources/application/WebPage/iTopWebPage.php
+++ b/sources/application/WebPage/iTopWebPage.php
@@ -138,7 +138,6 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/moment-with-locales.min.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/showdown.min.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/pages/backoffice.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/newsroom_menu.js');
 
 		$this->add_dict_entry('UI:FillAllMandatoryFields');