diff --git a/src/emulator.c b/src/emulator.c
index 8bd383b..277a75c 100644
--- a/src/emulator.c
+++ b/src/emulator.c
@@ -1222,7 +1222,7 @@ int main(int argc,char *argv[])
 	#ifdef GEKKO
 	dblbuffer=1;
 	hwsurface=1;
-	//sound_type=SOUND_ASND; //play_click does not work with ASND double buffer
+	sound_type=SOUND_ASND; //play_click does not work with ASND double buffer
 	setenv("HOME", "/fbzx-wii", 1);
 	
 	//initialize libfat library
diff --git a/src/menu_sdl.c b/src/menu_sdl.c
index a941a08..d30898b 100644
--- a/src/menu_sdl.c
+++ b/src/menu_sdl.c
@@ -47,7 +47,8 @@
 
 
 #if defined(GEKKO)
-# include <wiiuse/wpad.h> 
+#include <wiiuse/wpad.h> 
+#include <asndlib.h>
 #endif
 
 #ifdef DEBUG
@@ -1619,6 +1620,14 @@ int menu_is_inited(void)
 //Sound must be reseted before calling this function
 void play_click(sound)
 {
+	
+	if (sound_type == SOUND_ASND)
+	{
+		ASND_SetVoice(2,VOICE_STEREO_16BIT_BE,ordenador.freq,0, click_buffer_pointer[sound],len_click_buffer[sound],
+			255, 255, NULL);
+		return;
+	}
+	
 	int inc;
 	int len_click_buffer_norm = len_click_buffer[sound]/ordenador.increment;