diff --git a/src/app/mainapplication.cpp b/src/app/mainapplication.cpp
index 8ee87931f..f57215da6 100644
--- a/src/app/mainapplication.cpp
+++ b/src/app/mainapplication.cpp
@@ -218,7 +218,7 @@ void MainApplication::loadSettings()
         cssFile.close();
     }
 #endif
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
     if (QFile(m_activeThemePath + "windows.css").exists()) {
         cssFile.setFileName(m_activeThemePath + "windows.css");
         cssFile.open(QFile::ReadOnly);
diff --git a/src/app/qupzilla.cpp b/src/app/qupzilla.cpp
index ab7ed89a6..509a63982 100644
--- a/src/app/qupzilla.cpp
+++ b/src/app/qupzilla.cpp
@@ -60,7 +60,7 @@
 #include "bookmarksimportdialog.h"
 #include "globalfunctions.h"
 #include "webhistorywrapper.h"
-#include "menu.h"
+#include "enhancedmenu.h"
 
 const QString QupZilla::VERSION = "1.1.0";
 const QString QupZilla::BUILDTIME =  __DATE__" "__TIME__;
diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp
index 35d3bb689..5a69b38d7 100644
--- a/src/bookmarks/bookmarkstoolbar.cpp
+++ b/src/bookmarks/bookmarkstoolbar.cpp
@@ -22,7 +22,7 @@
 #include "historymodel.h"
 #include "toolbutton.h"
 #include "databasewriter.h"
-#include "menu.h"
+#include "enhancedmenu.h"
 
 BookmarksToolbar::BookmarksToolbar(QupZilla* mainClass, QWidget* parent)
     : QWidget(parent)
diff --git a/src/navigation/navigationbar.cpp b/src/navigation/navigationbar.cpp
index 0b0186163..0fe923453 100644
--- a/src/navigation/navigationbar.cpp
+++ b/src/navigation/navigationbar.cpp
@@ -22,7 +22,7 @@
 #include "websearchbar.h"
 #include "reloadstopbutton.h"
 #include "webhistorywrapper.h"
-#include "menu.h"
+#include "enhancedmenu.h"
 
 NavigationBar::NavigationBar(QupZilla* mainClass, QWidget* parent)
     : QWidget(parent)
diff --git a/src/other/sourceviewer.cpp b/src/other/sourceviewer.cpp
index f9aca1039..1c3d8b6d3 100644
--- a/src/other/sourceviewer.cpp
+++ b/src/other/sourceviewer.cpp
@@ -21,7 +21,7 @@
 #include "sourceviewersearch.h"
 #include "globalfunctions.h"
 #include "iconprovider.h"
-#include "menu.h"
+#include "enhancedmenu.h"
 
 SourceViewer::SourceViewer(QWebPage* page, const QString &selectedHtml)
     : QWidget(0)
diff --git a/src/src.pro b/src/src.pro
index ca33c534b..8ff00b3f0 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -177,7 +177,7 @@ SOURCES += main.cpp\
     plugins/speeddial.cpp \
     other/databasewriter.cpp \
     bookmarksimport/htmlimporter.cpp \
-    tools/menu.cpp
+    tools/enhancedmenu.cpp
 
 HEADERS  += \
     3rdparty/qtwin.h \
@@ -296,7 +296,7 @@ HEADERS  += \
     plugins/speeddial.h \
     other/databasewriter.h \
     bookmarksimport/htmlimporter.h \
-    tools/menu.h
+    tools/enhancedmenu.h
 
 FORMS    += \
     preferences/autofillmanager.ui \
diff --git a/src/tools/menu.cpp b/src/tools/enhancedmenu.cpp
similarity index 98%
rename from src/tools/menu.cpp
rename to src/tools/enhancedmenu.cpp
index f68f7d5d4..0a557c97c 100644
--- a/src/tools/menu.cpp
+++ b/src/tools/enhancedmenu.cpp
@@ -15,7 +15,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
-#include "menu.h"
+#include "enhancedmenu.h"
 
 Menu::Menu(QWidget* parent)
     : QMenu(parent)
@@ -37,13 +37,13 @@ void Menu::mouseReleaseEvent(QMouseEvent* e)
     }
 
     if (e->button() == Qt::LeftButton && e->modifiers() == Qt::NoModifier) {
-        act->trigger();
         closeAllMenus();
+        act->trigger();
         e->accept();
     }
     else if (e->button() == Qt::MiddleButton || (e->button() == Qt::LeftButton && e->modifiers() == Qt::ControlModifier)) {
-        act->triggerMiddleClick();
         closeAllMenus();
+        act->triggerMiddleClick();
         e->accept();
     }
 }
diff --git a/src/tools/menu.h b/src/tools/enhancedmenu.h
similarity index 95%
rename from src/tools/menu.h
rename to src/tools/enhancedmenu.h
index 600fb0239..527eb1874 100644
--- a/src/tools/menu.h
+++ b/src/tools/enhancedmenu.h
@@ -15,8 +15,8 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
-#ifndef MENU_H
-#define MENU_H
+#ifndef ENHANCEDMENU_H
+#define ENHANCEDMENU_H
 
 #include <QMenu>
 #include <QMouseEvent>
@@ -55,4 +55,4 @@ public slots:
 
 };
 
-#endif // MENU_H
+#endif // ENHANCEDMENU_H