diff --git a/x64_dbg_gui/Project/Src/BasicView/ScriptView.cpp b/x64_dbg_gui/Project/Src/BasicView/ScriptView.cpp
index d19d6d1e..29e615d7 100644
--- a/x64_dbg_gui/Project/Src/BasicView/ScriptView.cpp
+++ b/x64_dbg_gui/Project/Src/BasicView/ScriptView.cpp
@@ -224,6 +224,8 @@ void ScriptView::error(int line, QString message)
         title="Script Error!";
     QMessageBox msg(QMessageBox::Critical, title, message);
     msg.setWindowIcon(QIcon(":/icons/images/script-error.png"));
+    msg.setParent(this, Qt::Dialog);
+    msg.setWindowFlags(msg.windowFlags()&(~Qt::WindowContextHelpButtonHint));
     msg.exec();
 }
 
@@ -306,6 +308,8 @@ void ScriptView::message(QString message)
 {
     QMessageBox msg(QMessageBox::Information, "Information", message);
     msg.setWindowIcon(QIcon(":/icons/images/information.png"));
+    msg.setParent(this, Qt::Dialog);
+    msg.setWindowFlags(msg.windowFlags()&(~Qt::WindowContextHelpButtonHint));
     msg.exec();
 }
 
@@ -322,6 +326,8 @@ void ScriptView::question(QString message)
 {
     QMessageBox msg(QMessageBox::Question, "Question", message, QMessageBox::Yes|QMessageBox::No);
     msg.setWindowIcon(QIcon(":/icons/images/question.png"));
+    msg.setParent(this, Qt::Dialog);
+    msg.setWindowFlags(msg.windowFlags()&(~Qt::WindowContextHelpButtonHint));
     if(msg.exec()==QMessageBox::Yes)
         Bridge::getBridge()->scriptResult=1;
     else
diff --git a/x64_dbg_gui/Project/Src/Gui/CPUDisassembly.cpp b/x64_dbg_gui/Project/Src/Gui/CPUDisassembly.cpp
index 0511ec10..f717a998 100644
--- a/x64_dbg_gui/Project/Src/Gui/CPUDisassembly.cpp
+++ b/x64_dbg_gui/Project/Src/Gui/CPUDisassembly.cpp
@@ -356,6 +356,8 @@ void CPUDisassembly::setLabel()
     {
         QMessageBox msg(QMessageBox::Critical, "Error!", "DbgSetLabelAt failed!");
         msg.setWindowIcon(QIcon(":/icons/images/compile-error.png"));
+        msg.setParent(this, Qt::Dialog);
+        msg.setWindowFlags(msg.windowFlags()&(~Qt::WindowContextHelpButtonHint));
         msg.exec();
     }
 }
@@ -375,6 +377,8 @@ void CPUDisassembly::setComment()
     {
         QMessageBox msg(QMessageBox::Critical, "Error!", "DbgSetCommentAt failed!");
         msg.setWindowIcon(QIcon(":/icons/images/compile-error.png"));
+        msg.setParent(this, Qt::Dialog);
+        msg.setWindowFlags(msg.windowFlags()&(~Qt::WindowContextHelpButtonHint));
         msg.exec();
     }
 }
@@ -391,6 +395,8 @@ void CPUDisassembly::setBookmark()
     {
         QMessageBox msg(QMessageBox::Critical, "Error!", "DbgSetBookmarkAt failed!");
         msg.setWindowIcon(QIcon(":/icons/images/compile-error.png"));
+        msg.setParent(this, Qt::Dialog);
+        msg.setWindowFlags(msg.windowFlags()&(~Qt::WindowContextHelpButtonHint));
         msg.exec();
     }
 }
@@ -412,6 +418,8 @@ void CPUDisassembly::toggleFunction()
 
         QMessageBox msg(QMessageBox::Question, "Add the function?", start_text + "-" + end_text + label_text, QMessageBox::Yes|QMessageBox::No);
         msg.setWindowIcon(QIcon(":/icons/images/compile.png"));
+        msg.setParent(this, Qt::Dialog);
+        msg.setWindowFlags(msg.windowFlags()&(~Qt::WindowContextHelpButtonHint));
         if(msg.exec() != QMessageBox::Yes)
             return;
         QString cmd = "functionadd " + start_text + "," + end_text;
@@ -429,6 +437,8 @@ void CPUDisassembly::toggleFunction()
         QMessageBox msg(QMessageBox::Warning, "Deleting the function:", start_text + "-" + end_text + label_text, QMessageBox::Ok|QMessageBox::Cancel);
         msg.setDefaultButton(QMessageBox::Cancel);
         msg.setWindowIcon(QIcon(":/icons/images/compile-warning.png"));
+        msg.setParent(this, Qt::Dialog);
+        msg.setWindowFlags(msg.windowFlags()&(~Qt::WindowContextHelpButtonHint));
         if(msg.exec() != QMessageBox::Ok)
             return;
         QString cmd = "functiondel " + start_text;
@@ -469,5 +479,7 @@ void CPUDisassembly::assembleAt()
 
     QMessageBox msg(QMessageBox::Critical, "Error!", "Function not (yet) supported...");
     msg.setWindowIcon(QIcon(":/icons/images/compile-error.png"));
+    msg.setParent(this, Qt::Dialog);
+    msg.setWindowFlags(msg.windowFlags()&(~Qt::WindowContextHelpButtonHint));
     msg.exec();
 }
diff --git a/x64_dbg_gui/Project/Src/Gui/GotoDialog.cpp b/x64_dbg_gui/Project/Src/Gui/GotoDialog.cpp
index 5c021643..954e8e4d 100644
--- a/x64_dbg_gui/Project/Src/Gui/GotoDialog.cpp
+++ b/x64_dbg_gui/Project/Src/Gui/GotoDialog.cpp
@@ -63,7 +63,6 @@ void GotoDialog::on_editExpression_textChanged(const QString &arg1)
                 addrText=QString(module)+"."+QString("%1").arg(addr, sizeof(int_t)*2, 16, QChar('0')).toUpper();
             else
                 addrText=QString("%1").arg(addr, sizeof(int_t)*2, 16, QChar('0')).toUpper();
-
             ui->labelError->setText(QString("<font color='#00FF00'><b>Correct expression! -> </b></color>" + addrText));
             ui->buttonOk->setEnabled(true);
             expressionText=arg1;
diff --git a/x64_dbg_gui/Project/Src/Gui/MainWindow.cpp b/x64_dbg_gui/Project/Src/Gui/MainWindow.cpp
index 664ebca6..951794e8 100644
--- a/x64_dbg_gui/Project/Src/Gui/MainWindow.cpp
+++ b/x64_dbg_gui/Project/Src/Gui/MainWindow.cpp
@@ -125,6 +125,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
     {
         QMessageBox msg(QMessageBox::Critical, "DbgInit Error!", QString(errormsg));
         msg.setWindowIcon(QIcon(":/icons/images/compile-error.png"));
+        msg.setParent(this, Qt::Dialog);
+        msg.setWindowFlags(msg.windowFlags()&(~Qt::WindowContextHelpButtonHint));
         msg.exec();
         ExitProcess(1);
     }
@@ -199,6 +201,8 @@ void MainWindow::updateMRUMenu()
     {
         QMessageBox msg(QMessageBox::Critical, "Error!", "Failed to find menu!");
         msg.setWindowIcon(QIcon(":/icons/images/compile-error.png"));
+        msg.setParent(this, Qt::Dialog);
+        msg.setWindowFlags(msg.windowFlags()&(~Qt::WindowContextHelpButtonHint));
         msg.exec();
         return;
     }
@@ -207,6 +211,8 @@ void MainWindow::updateMRUMenu()
     {
         QMessageBox msg(QMessageBox::Critical, "Error!", "Failed to find submenu!");
         msg.setWindowIcon(QIcon(":/icons/images/compile-error.png"));
+        msg.setParent(this, Qt::Dialog);
+        msg.setWindowFlags(msg.windowFlags()&(~Qt::WindowContextHelpButtonHint));
         msg.exec();
         return;
     }