diff --git a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less
index f191e26be8..22e4a88ba8 100644
--- a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less
+++ b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less
@@ -76,6 +76,7 @@
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
+    margin-right: 60px;
 }
 
 .DashboardGraphs-filterDropdownText,
@@ -119,24 +120,14 @@
     text-transform: uppercase;
 }
 
-.DashboardGraphs-periodDropdown{
+.DashboardGraphs-periodDropdown,
+.DashboardGraphs-jobTypeDropdown,
+.DashboardGraphs-statusDropdown {
     padding-top:5px;
 }
 
-.DashboardGraphs-jobTypeDropdown{
-    padding-top:5px;
-}
-
-.DashboardGraphs-filterDropdownItems--period {
-    margin-left: -42px;
-}
-
-.DashboardGraphs-filterDropdownItems--jobType {
-    margin-left: -95px;
-}
-
-.DashboardGraphs-filterDropdownItems--status {
-    margin-left: -96px;
+.DashboardGraphs-filterDropdownItems {
+    min-width: 0;
 }
 
 .DashboardGraphs-statusFilters{
@@ -184,7 +175,12 @@
     }
 }
 
-@media only screen and (max-width: 540px) {
+@media only screen and (max-width: 800px) {
+    .DashboardGraphs-graphToolbar {
+        width: 100%;
+        margin-right: 0px;
+    }
+
     .DashboardGraphs-filteringDropdowns {
         float: left;
         width: 100%;
diff --git a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html
index 0c18724e42..3cbbf34c49 100644
--- a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html
+++ b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html
@@ -56,13 +56,16 @@
             </div>
             <div class="DashboardGraphs-filteringDropdowns">
                 <div class="DashboardGraphs-filterLabel">View</div>
-                <div class="DashboardGraphs-periodDropdown">
+                <div class="DashboardGraphs-statusDropdown">
                     <a id="status-dropdown" role="button"
                     data-toggle="dropdown"
                     data-target="#"
                     href="/page.html"
                     class="DashboardGraphs-filterDropdownText">
-                        All <i class="fa fa-chevron-down DashboardGraphs-filterIcon"></i>
+                        All
+                        <i class="fa fa-chevron-down
+                            DashboardGraphs-filterIcon">
+                        </i>
                     </a>
 
                     <ul class="dropdown-menu DashboardGraphs-filterDropdownItems
diff --git a/awx/ui/client/src/shared/Utilities.js b/awx/ui/client/src/shared/Utilities.js
index c6b5db0016..e1d1a5983a 100644
--- a/awx/ui/client/src/shared/Utilities.js
+++ b/awx/ui/client/src/shared/Utilities.js
@@ -650,7 +650,6 @@ angular.module('Utilities', ['RestServices', 'Utilities', 'sanitizeFilter'])
                 }
 
                 if (addNew) {
-                    $(element).prepend("<option></option>");
                     config.tags = true;
                     config.tokenSeparators = [];
                 }