diff --git a/src/dialogs/errordialog.cpp b/src/dialogs/errordialog.cpp
index 5640a5122..e5b505732 100644
--- a/src/dialogs/errordialog.cpp
+++ b/src/dialogs/errordialog.cpp
@@ -39,6 +39,7 @@ using namespace Qt::Literals::StringLiterals;
 
 ErrorDialog::ErrorDialog(QWidget *parent)
     : QDialog(parent),
+      parent_(parent),
       ui_(new Ui_ErrorDialog) {
 
   ui_->setupUi(this);
@@ -66,8 +67,11 @@ void ErrorDialog::ShowMessage(const QString &message) {
   UpdateContent();
 
   show();
-  raise();
-  activateWindow();
+
+  if (parent_ && parent_->isMaximized()) {
+    raise();
+    activateWindow();
+  }
 
 }
 
diff --git a/src/dialogs/errordialog.h b/src/dialogs/errordialog.h
index c563c854e..494741f15 100644
--- a/src/dialogs/errordialog.h
+++ b/src/dialogs/errordialog.h
@@ -48,6 +48,7 @@ class ErrorDialog : public QDialog {
  private:
   void UpdateContent();
 
+  QWidget *parent_;
   Ui_ErrorDialog *ui_;
 
   QStringList current_messages_;