diff --git a/src/gui/FWWindow.cpp b/src/gui/FWWindow.cpp
index f00cc94a1..e3d6d0206 100644
--- a/src/gui/FWWindow.cpp
+++ b/src/gui/FWWindow.cpp
@@ -1402,26 +1402,13 @@ void FWWindow::showTutorial(QString tutorial)
     if (fwbdebug)
         qDebug() << "FWWindow::showTutorial:" << tutorial;
 
-    Help *help = Help::getHelpWindow(this);
-    if (help->isVisible())
-    {
-        help->raise();
-        help->showNormal();
-        help->activateWindow();
-
-    }
     TutorialDialog *dialog;
     if (tutorial.isEmpty())
         dialog= new TutorialDialog(
             sender()->objectName().remove(0,7).toLower(), this);
     else
         dialog = new TutorialDialog(tutorial, this);
-    dialog->move(help->pos());
-    dialog->resize(help->size());
     dialog->show();
-    help->hide();
-    help->reject();
-    dialog->activateWindow();
 }
 
 void FWWindow::showReleaseNotes()
diff --git a/src/gui/Help.cpp b/src/gui/Help.cpp
index 4b9082553..0b7392bf9 100644
--- a/src/gui/Help.cpp
+++ b/src/gui/Help.cpp
@@ -29,7 +29,6 @@
 
 #include "Help.h"
 #include "FWWindow.h"
-#include "TutorialDialog.h"
 
 #include <QFile>
 #include <QLocale>
@@ -67,7 +66,7 @@ Help::Help(QWidget *parent, const QString &title, bool _load_links_in_browser) :
     resize(600, 700);
     //raise();
 
-    flags = windowFlags() | Qt::WindowStaysOnTopHint | Qt::WindowMinMaxButtonsHint;//| Qt::Dialog;
+    flags = windowFlags() | Qt::Dialog;
 };
 
 Help::~Help()
@@ -77,23 +76,10 @@ Help::~Help()
 
 Help* Help::getHelpWindow(QWidget* w)
 {
-    TutorialDialog *tutorial = mw->findChild<TutorialDialog*>();
     if (help_window == NULL)
-    {
         help_window = new Help(w, "Firewall Builder");
-        help_window->setWindowFlags(help_window->windowFlags() | Qt::WindowMinimizeButtonHint);
-    }
 
     //if (parent != mw) help_window->setParent(parent, help_window->flags);
-    if (tutorial)
-    {
-        help_window->resize(tutorial->size());
-        help_window->move(tutorial->pos());
-        tutorial->reject();
-    }
-    help_window->raise();
-    help_window->showNormal();
-    help_window->activateWindow();
     return help_window;
 }
 
diff --git a/src/gui/TutorialDialog.cpp b/src/gui/TutorialDialog.cpp
index d330ea9a5..ee362bd1b 100644
--- a/src/gui/TutorialDialog.cpp
+++ b/src/gui/TutorialDialog.cpp
@@ -58,7 +58,6 @@ TutorialDialog::TutorialDialog(QString tutorial, QWidget *parent) :
     showPage(currentPage);
 
     wfl->registerTutorialViewing(tutorial);
-    this->setWindowFlags(this->windowFlags() | Qt::WindowMinimizeButtonHint);
 }
 
 void TutorialDialog::resizeEvent(QResizeEvent *)
diff --git a/src/gui/helpview_q.ui b/src/gui/helpview_q.ui
index ae1e0f566..e7229791c 100644
--- a/src/gui/helpview_q.ui
+++ b/src/gui/helpview_q.ui
@@ -3,7 +3,7 @@
  <class>HelpView_q</class>
  <widget class="QDialog" name="HelpView_q">
   <property name="windowModality">
-   <enum>Qt::NonModal</enum>
+   <enum>Qt::ApplicationModal</enum>
   </property>
   <property name="geometry">
    <rect>