diff --git a/source/hid/hid.c b/source/hid/hid.c
index 4434e0c..d2dd5ab 100644
--- a/source/hid/hid.c
+++ b/source/hid/hid.c
@@ -84,12 +84,13 @@ Inputs *hidRead(){
 Inputs *hidWaitMask(u32 mask){
     Inputs *in = hidRead();
 
-    while (in->buttons)
+    while (in->buttons & mask)
         hidRead();
 
-    while ((in->buttons & mask) == 0){
-        in = hidRead();
+    while (!(in->buttons & mask)){
+        hidRead();
     }
+
     return in;
 }
 
diff --git a/source/tegraexplorer/fs/filemenu.c b/source/tegraexplorer/fs/filemenu.c
index dfc82b3..bbd3310 100644
--- a/source/tegraexplorer/fs/filemenu.c
+++ b/source/tegraexplorer/fs/filemenu.c
@@ -191,9 +191,11 @@ int filemenu(menu_entry file){
             break;
         case FILE_SCRIPT:
             //ParseScript(fsutil_getnextloc(currentpath, file.name));
+            /*
             gfx_printf(" %kRelease any buttons if held!", COLOR_RED);
 
             while (hidRead()->buttons);
+            */
 
             runScript(fsutil_getnextloc(currentpath, file.name));
             fsreader_readfolder(currentpath);