diff --git a/assets/js/lib/functions.js b/assets/js/lib/functions.js
index fe894b51..aaa9c3d8 100755
--- a/assets/js/lib/functions.js
+++ b/assets/js/lib/functions.js
@@ -144,6 +144,8 @@ function check_if_table_needs_scroll_bar() {
 		}
 	}
 	
+	// Scroll selected targets in modules/common/templates/elements/selected_targets.tpl
+	$('#targets').height($('#view_page').height() - $('#selected-items-header').height() - 5);
 }
 
 function refresh_current_page (url) {
diff --git a/modules/common/templates/elements/selector_list_targets.tpl b/modules/common/templates/elements/selector_list_targets.tpl
index 616802ee..64fecb5a 100755
--- a/modules/common/templates/elements/selector_list_targets.tpl
+++ b/modules/common/templates/elements/selector_list_targets.tpl
@@ -62,7 +62,8 @@
 		{include file='elements/cancelForm.tpl' cancel_action='cancel'}
 	</dl>
 	<dl id="view_data_right">
-		{view_section heading="Selected Items"}
+		<div id="selected-items-header">
+			{view_section heading="Selected Items"}
 			<div id="view_data_bottom">
 				<table class="datagrid" id="datagrid1" cellspacing="0" cellpadding="0">
 					<thead>
@@ -88,12 +89,13 @@
 					</tbody>
 				</table>
 			</div>
-		{/view_section}
+			{/view_section}
 		{view_section dont_prettify="true" heading="Selected $title [<a href='#' class='remove_all'>Remove All</a>]"}		
 			<input type="hidden" id="target_link" value="{$link}" />
 			<input type="hidden" id="targets_text">
+		</div>
 			<div id="view_data_bottom">
-				<div id="targets" style="overflow: auto;">
+				<div id="targets" style="overflow-y: auto;">
 					{include file="elements/selected_targets.tpl"}
 				</div>
 			</div>
diff --git a/modules/public_pages/erp/order/sales_order/resources/css/sales_order.less b/modules/public_pages/erp/order/sales_order/resources/css/sales_order.less
index c4e63c30..add5a950 100755
--- a/modules/public_pages/erp/order/sales_order/resources/css/sales_order.less
+++ b/modules/public_pages/erp/order/sales_order/resources/css/sales_order.less
@@ -80,4 +80,9 @@ select.tax_rate {
 #SOrder_status.cancelled {
 	background-color: yellow;
 	border-radius: 5px;
-}
\ No newline at end of file
+}
+
+/* soproductselectors > select_targets */
+#selected-items-header {
+	display:inline-block; width:100%;
+}