diff --git a/Changelog b/Changelog
index 253ecd7f2..fe914a25d 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,7 @@
 		- BUGFIX: Window can now stay maximized on exit
 		- BUGFIX: Use PKGCONFIG again for configuring libtorrent
 		- BUGFIX: Allow to compile with libtorrent v0.11
+		- BUGFIX: Disabled context menu in toolbar (makes no sense)
 		- I18N: Added Japanese translation
 
 * Wed Apr 04 2007 - Christophe Dumez <chris@qbittorrent.org> - v0.9.1
diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index 21c7c72d5..2fcf871b7 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -782,6 +782,9 @@
    <property name="enabled" >
     <bool>true</bool>
    </property>
+   <property name="contextMenuPolicy" >
+    <enum>Qt::NoContextMenu</enum>
+   </property>
    <property name="movable" >
     <bool>false</bool>
    </property>