2 files changed, 15 insertions, 0 deletions
diff --git a/src/qt/messagepage.cpp b/src/qt/messagepage.cpp
index 57ad8292dc..236b67bf37 100644
--- a/src/qt/messagepage.cpp
+++ b/src/qt/messagepage.cpp
@@ -31,6 +31,7 @@ MessagePage::MessagePage(QWidget *parent) :
 #endif
 
     GUIUtil::setupAddressWidget(ui->signFrom, this);
+    ui->signature->installEventFilter(this);
 }
 
 MessagePage::~MessagePage()
@@ -117,3 +118,14 @@ void MessagePage::on_clearButton_clicked()
     ui->message->clear();
     ui->signature->clear();
 }
+
+bool MessagePage::eventFilter(QObject *object, QEvent *event)
+{
+    if(object == ui->signature && (event->type() == QEvent::MouseButtonPress ||
+                                   event->type() == QEvent::FocusIn))
+    {
+        ui->signature->selectAll();
+        return true;
+    }
+    return QDialog::eventFilter(object, event);
+}
diff --git a/src/qt/messagepage.h b/src/qt/messagepage.h
index b5a38166da..d668ae98d0 100644
--- a/src/qt/messagepage.h
+++ b/src/qt/messagepage.h
@@ -23,6 +23,9 @@ public:
 
     void setAddress(QString);
 
+protected:
+    bool eventFilter(QObject *object, QEvent *event);
+
 private:
     Ui::MessagePage *ui;
     WalletModel *model;