diff --git a/api/js/etemplate/et2_widget_link.js b/api/js/etemplate/et2_widget_link.js
index c7148d66c5..117fa531ec 100644
--- a/api/js/etemplate/et2_widget_link.js
+++ b/api/js/etemplate/et2_widget_link.js
@@ -663,7 +663,7 @@ var et2_link_entry = (function(){ "use strict"; return et2_inputWidget.extend(
 				item.label = extra.label ? extra.label : extra;
 				if(extra['style.backgroundColor'] || extra.color)
 				{
-					li.css('backgroundColor', extra.color ? extra.color : extra['style.backgroundColor']);
+					li.css({'border-left': '5px solid ' + (extra.color ? extra.color : extra['style.backgroundColor'])});
 				}
 				// Careful with this, some browsers may have trouble loading all at once, which can slow display
 				if(extra.icon)
@@ -682,7 +682,7 @@ var et2_link_entry = (function(){ "use strict"; return et2_inputWidget.extend(
 			// Normal stuff
 			li.append(jQuery( "<a></a>" ).text( item.label ))
 				.appendTo(ul);
-
+			window.setTimeout(function(){ul.toggleClass('ui-menu-rtl',(ul.offset().left + ul.width() > window.outerWidth))}, 300);
 			return li;
 		};
 
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index a27e84e498..5dd5d60313 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -704,8 +704,11 @@ div.et2_link_entry select {
   width: 40%;
   margin-right: 10px;
 }
+div.et2_link_entry .ui-autocomplete.ui-menu.ui-menu-rtl {left:auto !important;right:0px;}
+div.et2_link_entry .ui-autocomplete.ui-menu .ui-menu-item {border-left:5px solid transparent;}
 div.et2_link_entry input.ui-autocomplete-input {
   padding-bottom: 1px;
+  width: calc(60% - 10px);
 }
 .et2_link_entry.no_app input.ui-autocomplete-input {
   width: 100%;