diff --git a/application/views/widgets/filter/selectFields.php b/application/views/widgets/filter/selectFields.php
index 14ba39284..57edda25e 100644
--- a/application/views/widgets/filter/selectFields.php
+++ b/application/views/widgets/filter/selectFields.php
@@ -196,13 +196,16 @@
 					var fieldName = data.allSelectedFields[i];
 					var fieldToDisplay = data.allSelectedFields[i];
 
-					if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
+					if (data.selectedFields.indexOf(fieldName) < 0)
 					{
-						fieldToDisplay = data.allColumnsAliases[i];
-					}
+						if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
+						{
+							fieldToDisplay = data.allColumnsAliases[i];
+						}
 
-					strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
-					$("#addField").append(strDropDown);
+						strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
+						$("#addField").append(strDropDown);
+					}
 				}
 			}
 
diff --git a/application/views/widgets/filter/selectFilters.php b/application/views/widgets/filter/selectFilters.php
index 5b33352c5..f79a1e449 100644
--- a/application/views/widgets/filter/selectFilters.php
+++ b/application/views/widgets/filter/selectFilters.php
@@ -216,20 +216,6 @@
 				var strDropDown = '<option value="">Select a filter to add...</option>';
 				$("#addFilter").append(strDropDown);
 
-				for (var i = 0; i < data.allSelectedFields.length; i++)
-				{
-					var fieldName = data.allSelectedFields[i];
-					var fieldToDisplay = data.allSelectedFields[i];
-
-					if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
-					{
-						fieldToDisplay = data.allColumnsAliases[i];
-					}
-
-					strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
-					$("#addFilter").append(strDropDown);
-				}
-
 				for (var i = 0; i < data.selectedFilters.length; i++)
 				{
 					var selectedFilters = '<div>';
@@ -253,6 +239,23 @@
 
 					$("#selectedFilters").append(selectedFilters);
 				}
+
+				for (var i = 0; i < data.allSelectedFields.length; i++)
+				{
+					var fieldName = data.allSelectedFields[i];
+					var fieldToDisplay = data.allSelectedFields[i];
+
+					if (data.selectedFilters.indexOf(fieldName) < 0)
+					{
+						if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
+						{
+							fieldToDisplay = data.allColumnsAliases[i];
+						}
+
+						strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
+						$("#addFilter").append(strDropDown);
+					}
+				}
 			}
 
 			addEventsSFilters();