diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
index 9dd4e72d246..9e99c79e7dd 100644
--- a/src/app/legend/qgslegend.cpp
+++ b/src/app/legend/qgslegend.cpp
@@ -218,8 +218,12 @@ void QgsLegend::mousePressEvent( QMouseEvent * e )
   else if ( e->button() == Qt::RightButton )
   {
     QTreeWidgetItem* item = itemAt( e->pos() );
-    if ( item == currentItem() )
+    if ( !item || item == currentItem() )
+    {
+      if ( !item )
+        setCurrentItem( 0 );
       handleRightClickEvent( item, e->globalPos() );
+    }
   }
   QTreeWidget::mousePressEvent( e );
 }                               // contentsMousePressEvent