diff --git a/src/blackgui/infoarea.cpp b/src/blackgui/infoarea.cpp
index 3d52133e3..9dc4802bc 100644
--- a/src/blackgui/infoarea.cpp
+++ b/src/blackgui/infoarea.cpp
@@ -157,7 +157,7 @@ namespace BlackGui
         // which is the only visible one
         // selecting is tab text independent (can be hidden)
         if (!this->m_tabBar || this->m_tabBar->count() < 1) { return nullptr; }
-        foreach(const CDockWidgetInfoArea * ia, m_dockWidgetInfoAreas)
+        for (const CDockWidgetInfoArea *ia : m_dockWidgetInfoAreas)
         {
             if (ia->isFloating()) { continue; }
             if (ia->isWidgetVisible()) { return ia; }
@@ -177,7 +177,7 @@ namespace BlackGui
     QList<const CDockWidgetInfoArea *> CInfoArea::getDockWidgetInfoAreas() const
     {
         QList<const CDockWidgetInfoArea *> constDockWidgets;
-        foreach(const CDockWidgetInfoArea * dockWidgetInfoArea, m_dockWidgetInfoAreas)
+        for (const CDockWidgetInfoArea *dockWidgetInfoArea : m_dockWidgetInfoAreas)
         {
             constDockWidgets.append(dockWidgetInfoArea);
         }
@@ -246,10 +246,12 @@ namespace BlackGui
         if (event->key() == Qt::Key_Right)
         {
             this->selectRightTab();
+            event->accept();
         }
         else if (event->key() == Qt::Key_Left)
         {
             this->selectLeftTab();
+            event->accept();
         }
         else
         {
diff --git a/src/blackgui/overlaymessages.cpp b/src/blackgui/overlaymessages.cpp
index b740a6f3f..e3e3ef0a0 100644
--- a/src/blackgui/overlaymessages.cpp
+++ b/src/blackgui/overlaymessages.cpp
@@ -154,7 +154,7 @@ namespace BlackGui
         if (this->isVisible() && event->key() ==  Qt::Key_Escape)
         {
             this->close();
-            event->setAccepted(true);
+            event->accept();
         }
         else
         {
diff --git a/src/blackgui/overlaymessagesframe.cpp b/src/blackgui/overlaymessagesframe.cpp
index f1086ce3d..c218487ea 100644
--- a/src/blackgui/overlaymessagesframe.cpp
+++ b/src/blackgui/overlaymessagesframe.cpp
@@ -74,7 +74,7 @@ namespace BlackGui
         if (m_overlayMessages && event->key() == Qt::Key_Escape)
         {
             m_overlayMessages->close();
-            event->setAccepted(true);
+            event->accept();
         }
         else
         {