diff --git a/viewer.asm b/viewer.asm
index 978a5c9..1cb58ab 100644
--- a/viewer.asm
+++ b/viewer.asm
@@ -100,7 +100,7 @@ process_event:
 ; out:
 ;  clobbers bx
 filename_char_add:
-	cmp word [cur_filename_address], filename_window_data.filename + 2*FS_DIRENT_NAME_SIZE
+	cmp word [cur_filename_address], filename_window_data.filename + 2*(FS_DIRENT_NAME_SIZE-1)
 	je .done
 
 	mov bx, [cur_filename_address]
@@ -130,6 +130,7 @@ filename_char_del:
 ; out:
 ;  clobbers everything
 filename_ok:
+	; TODO: error management for empty file filename
 	mov cx, FS_DIRENT_NAME_SIZE
 	mov di, window_title
 	mov si, filename_window_data.filename
@@ -1103,8 +1104,7 @@ strlen:
 ; Variables
 ; ------------------------------------------------------------------
 
-tmp_window_title db "ponydos.asm", 0, 0
-window_title times FS_DIRENT_NAME_SIZE + 1 db 0
+window_title times FS_DIRENT_NAME_SIZE db 0
 
 cur_file_address: dw 0 ; Segment
 	dw 0