diff --git a/Cartfile b/Cartfile
index 31408653f3..331530b97e 100644
--- a/Cartfile
+++ b/Cartfile
@@ -11,3 +11,4 @@ github "LoopKit/LogglyService" "dev"
 github "LoopKit/MKRingProgressView" "appex-safe"
 github "dexman/Minizip" "master"
 github "instacart/TrueTime.swift"
+github "gestrich/NightscoutAPIClient" "dev"
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 35cc9a2a76..f3096ef0f7 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -12,3 +12,4 @@ github "i-schuetz/SwiftCharts" "0.6.5"
 github "instacart/TrueTime.swift" "5.1.0"
 github "ps2/NightscoutService" "f54ae00a3c362ccbcbac403b86bc6cd7320c9058"
 github "ps2/rileylink_ios" "0badcaca8c42a0a6cc430302a04133412cbbef58"
+github "gestrich/NightscoutAPIClient" "2a9dd24772db59c4aa528d1fb33e2c37a320fb13"
diff --git a/Loop/Views/SettingsView.swift b/Loop/Views/SettingsView.swift
index 7bffcf91dc..f83caceecc 100644
--- a/Loop/Views/SettingsView.swift
+++ b/Loop/Views/SettingsView.swift
@@ -222,9 +222,11 @@ extension SettingsView {
     }
     
     private var cgmChoices: [ActionSheet.Button] {
-        var result = viewModel.cgmManagerSettingsViewModel.availableDevices.map { availableDevice in
-            ActionSheet.Button.default(Text(availableDevice.localizedTitle)) {
-                self.viewModel.cgmManagerSettingsViewModel.didTapAdd(availableDevice)
+        var result = viewModel.cgmManagerSettingsViewModel.availableDevices
+            .sorted(by: {$0.localizedTitle < $1.localizedTitle})
+            .map { availableDevice in
+                ActionSheet.Button.default(Text(availableDevice.localizedTitle)) {
+                    self.viewModel.cgmManagerSettingsViewModel.didTapAdd(availableDevice)
             }
         }
         result.append(.cancel())