diff --git a/lib/wallet.py b/lib/wallet.py
index b0118c87..90f4dc97 100644
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -1419,7 +1419,11 @@ class Imported_Wallet(Abstract_Wallet):
     def delete_address(self, address):
         if address not in self.addresses:
             return
+        pubkey = self.get_public_key(address)
         self.addresses.pop(address)
+        if pubkey:
+            self.keystore.delete_imported_key(pubkey)
+            self.save_keystore()
         self.storage.put('addresses', self.addresses)
         self.storage.write()
 
@@ -1680,13 +1684,6 @@ class Simple_Deterministic_Wallet(Deterministic_Wallet):
     def save_keystore(self):
         self.storage.put('keystore', self.keystore.dump())
 
-    def delete_address(self, address):
-        pubkey = self.get_public_key(address)
-        self.keystore.delete_imported_key(pubkey)
-        self.save_keystore()
-        self.receiving_addresses.remove(address)
-        self.save_addresses()
-        self.storage.write()