diff --git a/Mapper.cpp b/Mapper.cpp
index c35d19d..d760b59 100644
--- a/Mapper.cpp
+++ b/Mapper.cpp
@@ -68,6 +68,17 @@ bool ShapeGraphicsItem::sceneEventFilter(QGraphicsItem * watched, QEvent * event
   }
 }
 
+void ShapeGraphicsItem::mousePressEvent(QGraphicsSceneMouseEvent * event)
+{
+  QGraphicsItem::mousePressEvent(event);
+
+  // Change mapping to currently selected shape.
+  if (event->button() == Qt::LeftButton)
+  {
+    MainWindow::instance()->setCurrentMapping(_mapping->getId());
+  }
+}
+
 void ShapeGraphicsItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
   QGraphicsItem::mouseMoveEvent(event);
diff --git a/Mapper.h b/Mapper.h
index 732d724..7f5220d 100644
--- a/Mapper.h
+++ b/Mapper.h
@@ -74,6 +74,7 @@ public:
 
   virtual bool sceneEventFilter(QGraphicsItem * watched, QEvent * event);
 
+  void mousePressEvent(QGraphicsSceneMouseEvent *event);
   void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
 //  virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);