diff --git a/contrib/media/fplay/Makefile b/contrib/media/fplay/Makefile
index 06c27e6913..f6f45416f4 100644
--- a/contrib/media/fplay/Makefile
+++ b/contrib/media/fplay/Makefile
@@ -1,6 +1,6 @@
 NAME= Fplay
 
-FASM= fasm.exe
+FASM= fasm
 CC = kos32-gcc
 AR = kos32-ar
 LD = kos32-ld
diff --git a/contrib/media/fplay/opendial.asm b/contrib/media/fplay/opendial.asm
index 416c1413d7..0090d7ef33 100644
--- a/contrib/media/fplay/opendial.asm
+++ b/contrib/media/fplay/opendial.asm
@@ -83,12 +83,15 @@ _get_moviefile:
 
         push    od
         call    [opendialog_start]
+        cmp     [od.status], 1
+        jne     .fail
 
         popad
         mov     eax, [od.openfile_path]; selected filePath
 
         ret
 .fail:
+        popad
         xor     eax, eax
         ret