diff --git a/src/core/AnswerButton.qml b/src/core/AnswerButton.qml
index c9f09a520..f4d21c407 100644
--- a/src/core/AnswerButton.qml
+++ b/src/core/AnswerButton.qml
@@ -1,264 +1,267 @@
 /*
   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
      *
-     * Set to true when to avoid misclicks or when correct/wrong answer
-     * animation are running.
+     * This variable holds the overall events during which the clicks on button will be blocked.
      */
-    property bool blockClicks: false
+    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 when answer button is clicked.
      */
     signal pressed
     onPressed: {
-        if (!blockClicks) {
-            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();
-            }
+        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
         ScriptAction {
             script: {
                 if (typeof(feedback) === "object")
                     feedback.playCorrectSound();
-                blockClicks = true;
                 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: {
-                blockClicks = false;
                 correctlyPressed();
             }
         }
     }
 
     SequentialAnimation {
         id: wrongAnswerAnimation
         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();
             }
         }
     }
 }