diff --git a/gui/qt/address_dialog.py b/gui/qt/address_dialog.py
index d4812a1aa..68ca823c7 100644
--- a/gui/qt/address_dialog.py
+++ b/gui/qt/address_dialog.py
@@ -25,9 +25,10 @@ from PyQt4.QtCore import *
 from util import *
 from history_widget import HistoryWidget
 
-class AddressDialog(QDialog):
+class AddressDialog(WindowModalDialog):
 
-    def __init__(self, address, parent):
+    def __init__(self, parent, address):
+        WindowModalDialog.__init__(self, parent, _("Address"))
         self.address = address
         self.parent = parent
         self.config = parent.config
@@ -35,10 +36,7 @@ class AddressDialog(QDialog):
         self.app = parent.app
         self.saved = True
 
-        QDialog.__init__(self)
         self.setMinimumWidth(700)
-        self.setWindowTitle(_("Address"))
-        self.setModal(1)
         vbox = QVBoxLayout()
         self.setLayout(vbox)
 
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
index 0be214cfc..5fc2b9323 100644
--- a/gui/qt/main_window.py
+++ b/gui/qt/main_window.py
@@ -607,7 +607,7 @@ class ElectrumWindow(QMainWindow, PrintError):
 
     def show_address(self, addr):
         import address_dialog
-        d = address_dialog.AddressDialog(addr, self)
+        d = address_dialog.AddressDialog(self, addr)
         d.exec_()
 
     def show_transaction(self, tx, tx_desc = None):