diff --git a/electrum/exchange_rate.py b/electrum/exchange_rate.py
index e4d0e3481..f943c2516 100644
--- a/electrum/exchange_rate.py
+++ b/electrum/exchange_rate.py
@@ -486,7 +486,8 @@ class FxThread(ThreadJob):
         return bool(self.config.get('use_exchange_rate'))
 
     def set_enabled(self, b):
-        return self.config.set_key('use_exchange_rate', bool(b))
+        self.config.set_key('use_exchange_rate', bool(b))
+        self.trigger.set()
 
     def get_history_config(self):
         return bool(self.config.get('history_rates'))
@@ -519,7 +520,7 @@ class FxThread(ThreadJob):
     def set_currency(self, ccy):
         self.ccy = ccy
         self.config.set_key('currency', ccy, True)
-        self.trigger.set() # Because self.ccy changes
+        self.trigger.set()  # Because self.ccy changes
         self.on_quotes()
 
     def set_exchange(self, name):
@@ -541,8 +542,8 @@ class FxThread(ThreadJob):
         if self.network:
             self.network.trigger_callback('on_history')
 
-    def exchange_rate(self):
-        '''Returns None, or the exchange rate as a Decimal'''
+    def exchange_rate(self) -> Decimal:
+        """Returns the exchange rate as a Decimal"""
         rate = self.exchange.quotes.get(self.ccy)
         if rate is None:
             return Decimal('NaN')
diff --git a/electrum/gui/kivy/main_window.py b/electrum/gui/kivy/main_window.py
index 0ba85313d..e100fba18 100644
--- a/electrum/gui/kivy/main_window.py
+++ b/electrum/gui/kivy/main_window.py
@@ -156,6 +156,7 @@ class ElectrumWindow(App):
 
     def on_quotes(self, d):
         Logger.info("on_quotes")
+        self._trigger_update_status()
         self._trigger_update_history()
 
     def on_history(self, d):