diff --git a/.gitignore b/.gitignore
index 63698fb9..3d183f1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ qgit.pro.*
 qgit.qbs.*
 src/release
 .qmake.stash
+.DS_Store
diff --git a/src/mainimpl.cpp b/src/mainimpl.cpp
index 4fd40c0c..edfdcb5e 100644
--- a/src/mainimpl.cpp
+++ b/src/mainimpl.cpp
@@ -282,7 +282,7 @@ void MainImpl::ActExternalDiff_activated() {
 	if (!QGit::startProcess(externalDiff, args)) {
 		QString text("Cannot start external viewer: ");
 		text.append(args[0]);
-		QMessageBox::warning(this, "Error - QGit", text);
+        QMessageBox::warning(this, "Error - QGit", text);
 		delete externalDiff;
 	}
 }
@@ -2109,9 +2109,21 @@ void MainImpl::ActFindNext_activated() {
 			             textToFind + "\" not found!", QMessageBox::Ok, 0);
 			return;
 		}
-		if (QMessageBox::question(this, "Find text - QGit", "End of document "
-		    "reached\n\nDo you want to continue from beginning?", QMessageBox::Yes,
-		    QMessageBox::No | QMessageBox::Escape) == QMessageBox::No)
+        QMessageBox msgBox(this);
+        msgBox.setWindowTitle("Find text - QGit");
+        msgBox.setIcon(QMessageBox::Question);
+        msgBox.setText(tr("End of document reached."));
+        msgBox.setInformativeText(tr("Do you want to continue from beginning?\n"));
+        msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+        msgBox.setDefaultButton(QMessageBox::No);
+        msgBox.setBaseSize(QSize(400, 160));
+        QList<QAbstractButton *> bList = msgBox.buttons();
+        for (int i=0; i<bList.count(); i++)
+        {
+            bList.at(i)->setFocusPolicy(Qt::StrongFocus);
+        }
+        int ret = msgBox.exec();
+        if (ret == QMessageBox::No)
 			return;
 
 		endOfDocument = true;