diff --git a/src/peerlistwidget.cpp b/src/peerlistwidget.cpp
index 24a33f3d8..848543933 100644
--- a/src/peerlistwidget.cpp
+++ b/src/peerlistwidget.cpp
@@ -143,6 +143,7 @@ void PeerListWidget::showPeerListMenu(QPoint) {
   }
   if(empty_menu) return;
   QAction *act = menu.exec(QCursor::pos());
+  if(act == 0) return;
   if(act == addPeerAct) {
     libtorrent::asio::ip::tcp::endpoint ep = PeerAdditionDlg::askForPeerEndpoint();
     if(ep != libtorrent::asio::ip::tcp::endpoint()) {
diff --git a/src/trackerlist.h b/src/trackerlist.h
index e89a2b81e..960e4546f 100644
--- a/src/trackerlist.h
+++ b/src/trackerlist.h
@@ -284,6 +284,7 @@ public slots:
       delAct = menu.addAction(QIcon(":/Icons/oxygen/list-remove.png"), "Remove tracker");
     }
     QAction *act = menu.exec(QCursor::pos());
+    if(act == 0) return;
     if(act == addAct) {
       askForTrackers();
       return;