diff --git a/src/client/app/charts/charts.html b/src/client/app/charts/charts.html
index 49ed6791..1be1707f 100644
--- a/src/client/app/charts/charts.html
+++ b/src/client/app/charts/charts.html
@@ -16,7 +16,7 @@
             <md-select ng-model="vm.selectedGranularity" aria-label="Granularity"
                 ng-change="vm.changeChart(vm.selectedInstrument, vm.selectedGranularity)">
                 <md-option ng-value="granularity"
-                    ng-selected="granularity == vm.selectedGranularity || $index == 0"
+                    ng-selected="granularity == vm.selectedGranularity"
                     ng-repeat="granularity in vm.granularities">
                     {{ granularity }}
                 </md-option>
diff --git a/src/client/app/charts/charts.js b/src/client/app/charts/charts.js
index 75865202..5c51bdf1 100644
--- a/src/client/app/charts/charts.js
+++ b/src/client/app/charts/charts.js
@@ -15,7 +15,6 @@
         vm.selectedInstrument = "EUR_USD";
 
         vm.granularities = [
-            "M5", // first due to https://github.com/angular/material/issues/5435
             "S5",
             "S10",
             "S15",
@@ -24,6 +23,7 @@
             "M2",
             "M3",
             "M4",
+            "M5",
             "M10",
             "M15",
             "M30",
diff --git a/src/client/app/charts/order-dialog.js b/src/client/app/charts/order-dialog.js
index 2c057ec3..5cf530ba 100644
--- a/src/client/app/charts/order-dialog.js
+++ b/src/client/app/charts/order-dialog.js
@@ -24,7 +24,6 @@
         vm.selectedInstrument = params.selectedInstrument;
         vm.changeMarket(vm.selectedInstrument);
         vm.expires = [
-            {label: "1 Week", value: 7 * 60 * 60 * 24 * 1000}, // first due to https://github.com/angular/material/issues/5435
             {label: "1 Hour", value: 60 * 60 * 1000},
             {label: "2 Hours", value: 2 * 60 * 60 * 1000},
             {label: "3 Hours", value: 3 * 60 * 60 * 1000},
@@ -36,6 +35,7 @@
             {label: "18 Hours", value: 18 * 60 * 60 * 1000},
             {label: "1 Day", value: 60 * 60 * 24 * 1000},
             {label: "2 Days", value: 2 * 60 * 60 * 24 * 1000},
+            {label: "1 Week", value: 7 * 60 * 60 * 24 * 1000},
             {label: "1 Month", value: 30 * 60 * 60 * 24 * 1000},
             {label: "2 Months", value: 60 * 60 * 60 * 24 * 1000},
             {label: "3 Months", value: 90 * 60 * 60 * 24 * 1000}