diff --git a/src/watercycle-activity/watercycle.py b/src/watercycle-activity/watercycle.py
old mode 100644
new mode 100755
index 9ed954d..e33e5d8
--- a/src/watercycle-activity/watercycle.py
+++ b/src/watercycle-activity/watercycle.py
@@ -46,6 +46,7 @@ class Gcompris_watercycle:
     # Higher is longer animation (slower)
     self.timerinc = 20
     self.step_time = 100
+    self.stopshower = 0
 
     # Need to manage the timers to quit properly
     self.waterlevel_timer = 0
@@ -229,7 +230,11 @@ class Gcompris_watercycle:
       parent = self.rootitem,
       svg_handle = svghandle,
       svg_id = "#SHOWER_BUTTON_ON",
-      visibility = goocanvas.ITEM_INVISIBLE
+      visibility = goocanvas.ITEM_INVISIBLE,
+      tooltip = "\n\n" + \
+        _("I'm not gonna waste water so I am only using water which is needed"
+          " Do it like me and Be a envirnomental water savior !!")
       )
     self.showerbuttonitem_on.connect("button_press_event", self.showerbutton_item_event,
                                      True)
@@ -305,6 +310,7 @@ class Gcompris_watercycle:
     # Remove all the timer first
     if self.waterlevel_timer :
       gobject.source_remove(self.waterlevel_timer)
+      self.stopshower = 0
 
     # Remove the root item removes all the others inside it
     self.rootitem.remove()
@@ -504,6 +510,7 @@ class Gcompris_watercycle:
       self.tuxshowerwateritem.props.visibility = goocanvas.ITEM_VISIBLE
       if not self.you_won:
         gcompris.bonus.display(gcompris.bonus.WIN, gcompris.bonus.FLOWER)
+        self.stopshower = 1
         self.you_won = True
     else:
       self.tuxshowerwateritem.props.visibility = goocanvas.ITEM_INVISIBLE
@@ -515,9 +522,11 @@ class Gcompris_watercycle:
 
     self.showerbutton = state
     if not self.showerbutton:
-      gcompris.sound.play_ogg("sounds/bleep.wav")
-      self.showerbuttonitem_on.props.visibility = goocanvas.ITEM_VISIBLE
-      self.showerbuttonitem_off.props.visibility = goocanvas.ITEM_INVISIBLE
+      if self.stopshower == 1:
+        gcompris.sound.play_ogg("sounds/bleep.wav")
+        self.showerbuttonitem_on.props.visibility = goocanvas.ITEM_VISIBLE
+        self.showerbuttonitem_off.props.visibility = goocanvas.ITEM_INVISIBLE
+        self.stopshower = self.stopshower + 1
     else:
       gcompris.sound.play_ogg("sounds/apert2.wav")
       self.showerbuttonitem_on.props.visibility = goocanvas.ITEM_INVISIBLE
