diff --git a/MappingManager.cpp b/MappingManager.cpp
index 0879848..9bf8de6 100644
--- a/MappingManager.cpp
+++ b/MappingManager.cpp
@@ -140,7 +140,7 @@ QVector<Mapping::ptr> MappingManager::getVisibleMappings() const
   for (QVector<Mapping::ptr>::const_iterator it = mappingVector.begin(); it != mappingVector.end(); ++it)
   {
     // Solo has priority over invisible (mute)
-    if ( (hasSolo && (*it)->isSolo()) || (!hasSolo && (*it)->isVisible()) )
+    if ( (hasSolo && (*it)->isSolo() && (*it)->isVisible()) || (!hasSolo && (*it)->isVisible()) )
       visible.push_back(*it);
   }