--- a/Simoleon/UI/CurrencySelector.swift	Sat Aug 28 19:17:55 2021 +0100
+++ b/Simoleon/UI/CurrencySelector.swift	Sat Aug 28 19:18:50 2021 +0100
@@ -10,7 +10,7 @@
 struct CurrencySelector: View {
     @State var currencyPair: CurrencyPairModel
     @State private var showingList = false
-    @State private var modalSelection: ModalType? = nil
+    @State private var modalSelection: ModalType = .allCurrencies
     let currencyPairsSupported: [String] = try! read(json: "CurrencyPairsSupported.json")
     
     private enum ModalType {
@@ -20,15 +20,15 @@
     var body: some View {
         HStack {
             Button(action: {
+                modalSelection = .allCurrencies
                 showingList = true
-                modalSelection = .allCurrencies
             }) {
                 CurrencyButton(selectedCurrency: currencyPair.baseSymbol)
             }
             
             Button(action: {
+                modalSelection = .compatibleCurrencies
                 showingList = true
-                modalSelection = .compatibleCurrencies
             }) {
                 CurrencyButton(selectedCurrency: currencyPair.quoteSymbol)
             }