diff --git a/src/activities/leftright/Leftright.qml b/src/activities/leftright/Leftright.qml
index a8c735547..a2ad4d6b8 100644
--- a/src/activities/leftright/Leftright.qml
+++ b/src/activities/leftright/Leftright.qml
@@ -1,190 +1,200 @@
 /* GCompris - Leftright.qml
  *
  * Copyright (C) 2014 Bruno Coudoin <bruno.coudoin@gcompris.net>
  *
  * Authors:
  *   Pascal Georges <pascal.georges1@free.fr> (GTK+ version)
  *   Bruno Coudoin <bruno.coudoin@gcompris.net> (Qt Quick port)
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 3 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU General Public License for more details.
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.6
 import GCompris 1.0
 import "../../core"
 import "leftright.js" as Activity
 
 ActivityBase {
     id: activity
 
     onStart: focus = true;
 
     Keys.onLeftPressed: Activity.leftClickPressed()
     Keys.onRightPressed: Activity.rightClickPressed()
 
     pageComponent: Image {
         id: background
         source: "qrc:/gcompris/src/activities/leftright/resource/back.svg"
         sourceSize.width: Math.max(parent.width, parent.height)
         focus: true
         signal start
         signal stop
         fillMode: Image.PreserveAspectCrop
 
         QtObject {
             id: items
             property alias bar: bar
             property alias bonus: bonus
             property GCSfx audioEffects: activity.audioEffects
             property alias imageAnimOff: imageAnimOff
             property alias leftButton: leftButton
             property alias rightButton: rightButton
             property alias score: score
+            property bool buttonsBlocked: false
         }
 
         Component.onCompleted: {
             activity.start.connect(start)
             activity.stop.connect(stop)
         }
         onStart: { Activity.start(items) }
         onStop: { Activity.stop() }
 
         Item {
             id: topBorder
             height: background.height * 0.08
         }
 
         Image {
             id: blackBoard
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.top: topBorder.bottom
             fillMode: Image.PreserveAspectFit
             sourceSize.width: Math.min(background.width,
                                        (background.height - leftButton.height - bar.height) * 1.3)
             source: "qrc:/gcompris/src/activities/leftright/resource/blackboard.svg"
 
             Image {
                 id: handImage
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.verticalCenter: parent.verticalCenter
                 fillMode: Image.PreserveAspectFit
                 scale: blackBoard.height / 300 * 0.8
                 opacity: 0
             }
 
             Image {
                 id: lightImage
                 source: "qrc:/gcompris/src/activities/leftright/resource/light.svg"
                 sourceSize.width: parent.width
                 sourceSize.height: parent.height
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.top: parent.top
                 anchors.topMargin: 40
                 opacity: 0
             }
 
             ParallelAnimation {
                 id: imageAnimOff
                 onRunningChanged: {
                     if (!imageAnimOff.running) {
                         handImage.source = Activity.getCurrentHandImage()
                         handImage.rotation = Activity.getCurrentHandRotation()
 
                         imageAnimOn.start()
                     }
                 }
                 NumberAnimation {
                     target: handImage
                     property: "opacity"
                     from: 1; to: 0
                     duration: 300
                     easing.type: Easing.InOutQuad
                 }
                 NumberAnimation {
                     target: lightImage
                     property: "opacity"
                     from: 0.2; to: 0
                     duration: 300
                     easing.type: Easing.InOutQuad
                 }
             }
             ParallelAnimation {
                 id: imageAnimOn
+                onStopped: bonus.isPlaying ? items.buttonsBlocked = true : items.buttonsBlocked = false
                 NumberAnimation {
                     target: handImage
                     property: "opacity"
                     from: 0; to: 1.0
                     duration: 300
                     easing.type: Easing.InOutQuad
                 }
                 NumberAnimation {
                     target: lightImage
                     property: "opacity"
                     from: 0; to: 0.2
                     duration: 300
                     easing.type: Easing.InOutQuad
                 }
             }
 
             AnswerButton {
                 id: leftButton
                 width: blackBoard.width * 0.45
                 height: background.height * 0.15
                 anchors.left: blackBoard.left
                 anchors.top: blackBoard.bottom
                 anchors.margins: 10
                 textLabel: qsTr("Left hand")
                 audioEffects: activity.audioEffects
-                onCorrectlyPressed: Activity.leftClick();
+                onPressed: items.buttonsBlocked = true
+                onCorrectlyPressed: Activity.leftClick()
+                blockAllButtonClicks: items.buttonsBlocked
+                onReadyWrong: items.buttonsBlocked = false
             }
 
             AnswerButton {
                 id: rightButton
                 width: blackBoard.width * 0.45
                 height: background.height * 0.15
                 anchors.right: blackBoard.right
                 anchors.top: blackBoard.bottom
                 anchors.margins: 10
                 audioEffects: activity.audioEffects
                 textLabel: qsTr("Right hand")
-                onCorrectlyPressed: Activity.rightClick();
+                onPressed: items.buttonsBlocked = true
+                onCorrectlyPressed: Activity.rightClick()
+                blockAllButtonClicks: items.buttonsBlocked
+                onReadyWrong: items.buttonsBlocked = false
             }
         }
 
         DialogHelp {
             id: dialogHelpLeftRight
             onClose: home()
         }
 
         Bar {
             id: bar
             content: BarEnumContent { value: help | home | level }
             onHelpClicked: {
                 displayDialog(dialogHelpLeftRight)
             }
             onPreviousLevelClicked: Activity.previousLevel()
             onNextLevelClicked: Activity.nextLevel()
             onHomeClicked: home()
         }
 
         Bonus {
             id: bonus
+            onStart: items.buttonsBlocked = true
+            onStop: items.buttonsBlocked = false
         }
 
         Score {
             id: score
             anchors.top: background.top
             anchors.bottom: undefined
         }
     }
 }
diff --git a/src/core/AnswerButton.qml b/src/core/AnswerButton.qml
index f4d21c407..85eb04489 100644
--- a/src/core/AnswerButton.qml
+++ b/src/core/AnswerButton.qml
@@ -1,267 +1,279 @@
 /*
   Copyed in GCompris from Touch'n'learn
     Touch'n'learn - Fun and easy mobile lessons for kids
     Copyright (C) 2010, 2011 by Alessandro Portale <alessandro@casaportale.de>
     http://touchandlearn.sourceforge.net
     This file is part of Touch'n'learn
     Touch'n'learn is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
     Touch'n'learn is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
     You should have received a copy of the GNU General Public License
     along with Touch'n'learn; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
 import QtQuick 2.6
 import GCompris 1.0
 
 /**
  * A QML component to display an answer button.
  *
  * AnswerButton consists of a text (@ref textLabel)
  * and animations on pressed.
  * Mostly used to present more than one option to select from
  * consisting of both good and bad answers.
  *
  * @inherit QtQuick.Item
  */
 Item {
     id: button
 
     /**
      * type:string
      * Text to display on the button.
      *
      * @sa label.text
      */
     property string textLabel
 
     /**
      * type:boolean
      *
      * Set to true when this element contains good answer.
      */
     property bool isCorrectAnswer: false
 
     /**
      * type:color
      *
      * Color of the container in normal state.
      */
     property color normalStateColor: "#fff"
 
     /**
      * type:color
      *
      * Color of the container on good answer selection.
      */
     property color correctStateColor: "#09f"
 
     /**
      * type:color
      *
      * Color of the container on bad answer selection.
      */
     property color wrongStateColor: "#f66"
 
     /**
      * type: bool
      *
      * Set the external conditions to this variable during which the clicks on button are to be blocked.
      */
     property bool blockAllButtonClicks: false
 
     /**
      * type:bool
      *
      * This variable holds the overall events during which the clicks on button will be blocked.
      */
     readonly property bool blockClicks: correctAnswerAnimation.running || wrongAnswerAnimation.running || blockAllButtonClicks
 
     /**
      * type:int
      *
      * Amplitude of the shake animation on wrong answer selection.
      */
     property int wrongAnswerShakeAmplitudeCalc: width * 0.2
 
     /**
      * type:int
      *
      * Minimum amplitude of the shake animation on wrong answer selection.
      */
     property int wrongAnswerShakeAmplitudeMin: 45
 
     /**
      * type:int
      *
      * Amplitude of the shake animation on wrong answer.
      * Selects min. from wrongAnswerShakeAmplitudeMin && wrongAnswerShakeAmplitudeCalc.
      */
     property int wrongAnswerShakeAmplitude: wrongAnswerShakeAmplitudeCalc < wrongAnswerShakeAmplitudeMin ? wrongAnswerShakeAmplitudeMin : wrongAnswerShakeAmplitudeCalc
 
     // If you want the sound effects just pass the audioEffects
     property GCSfx audioEffects
 
     /**
      * Emitted when button is pressed as a good answer.
      *
      * Triggers correctAnswerAnimation.
      */
     signal correctlyPressed
 
     /**
      * Emitted when button is pressed as a bad answer.
      *
      * Triggers wrongAnswerAnimation.
      */
     signal incorrectlyPressed
 
+    /**
+     * Emitted after animation of correct answer
+     */
+    signal readyCorrect
+    
+    /**
+     * Emitted after animation of incorrect answer
+     */
+    signal readyWrong
+    
     /**
      * Emitted when answer button is clicked.
      */
     signal pressed
     onPressed: {
         if (isCorrectAnswer) {
             if(audioEffects)
                 audioEffects.play("qrc:/gcompris/src/core/resource/sounds/win.wav")
             correctAnswerAnimation.start();
         } else {
             if(audioEffects)
                 audioEffects.play("qrc:/gcompris/src/core/resource/sounds/crash.wav")
             wrongAnswerAnimation.start();
         }
     }
 
     Rectangle {
         id: rect
         anchors.fill: parent
         color: normalStateColor
         opacity: 0.5
     }
     ParticleSystemStarLoader {
         id: particles
     }
     Image {
         source: "qrc:/gcompris/src/core/resource/button.svg"
         sourceSize { height: parent.height; width: parent.width }
         width: sourceSize.width
         height: sourceSize.height
         smooth: false
     }
     GCText {
         id: label
         anchors.verticalCenter: parent.verticalCenter
         // We need to manually horizonally center the text, because in wrongAnswerAnimation,
         // the x of the text is changed, which would not work if we use an anchor layout.
         property int horizontallyCenteredX: (button.width - contentWidth) >> 1;
         width: button.width
         x: horizontallyCenteredX;
         fontSizeMode: Text.Fit
         font.bold: true
         text: textLabel
         color: "#373737"
     }
 
     MouseArea {
         id: mouseArea
         anchors.fill: parent
         enabled: !blockClicks
         onPressed: button.pressed()
     }
 
     SequentialAnimation {
         id: correctAnswerAnimation
+        onStopped: button.readyCorrect()
         ScriptAction {
             script: {
                 if (typeof(feedback) === "object")
                     feedback.playCorrectSound();
                 if (typeof(particles) === "object")
                     particles.burst(40);
             }
         }
         PropertyAction {
             target: rect
             property: "color"
             value: correctStateColor
         }
         PropertyAnimation {
             target: rect
             property: "color"
             to: normalStateColor
             duration: 700
         }
         PauseAnimation {
             duration: 300 // Wait for particles to finish
         }
         ScriptAction {
             script: {
                 correctlyPressed();
             }
         }
     }
 
     SequentialAnimation {
         id: wrongAnswerAnimation
+        onStopped: button.readyWrong()
         ParallelAnimation {
             SequentialAnimation {
                 PropertyAction {
                     target: rect
                     property: "color"
                     value: wrongStateColor
                 }
                 ScriptAction {
                     script: {
                         if (typeof(feedback) === "object")
                             feedback.playIncorrectSound();
                     }
                 }
                 PropertyAnimation {
                     target: rect
                     property: "color"
                     to: normalStateColor
                     duration: 600
                 }
             }
             SequentialAnimation {
                 PropertyAnimation {
                     target: label
                     property: "x"
                     to: label.horizontallyCenteredX - wrongAnswerShakeAmplitude
                     easing.type: Easing.InCubic
                     duration: 120
                 }
                 PropertyAnimation {
                     target: label
                     property: "x"
                     to: label.horizontallyCenteredX + wrongAnswerShakeAmplitude
                     easing.type: Easing.InOutCubic
                     duration: 220
                 }
                 PropertyAnimation {
                     target: label
                     property: "x"
                     to: label.horizontallyCenteredX
                     easing { type: Easing.OutBack; overshoot: 3 }
                     duration: 180
                 }
             }
         }
         PropertyAnimation {
             target: rect
             property: "color"
             to: normalStateColor
             duration: 450
         }
         ScriptAction {
             script: {
                 incorrectlyPressed();
             }
         }
     }
 }