diff --git a/apps/plugins/keybox.c b/apps/plugins/keybox.c
index 448050938f..6c59470fa4 100644
--- a/apps/plugins/keybox.c
+++ b/apps/plugins/keybox.c
@@ -182,7 +182,7 @@ static void add_entry(int selected_item)
     for (i = 0; i < MAX_ENTRIES && pw_list.entries[i].used; i++)
         ;
 
-    if (pw_list.entries[i].used)
+    if (MAX_ENTRIES == i)
     {
         rb->splash(HZ, "Password list full");
         return;
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c
index 84a333e1fb..12ec4e9093 100644
--- a/apps/plugins/matrix.c
+++ b/apps/plugins/matrix.c
@@ -283,7 +283,7 @@ static void matrix_loop(void)
 
                 if (i > ROWS) {
                     matrix[z][j].val = 129;
-                    matrix[ROWS][j].bold = 1;
+                    matrix[ROWS - 1][j].bold = 1;
                     matrix_blit_char(z - 1, j, matrix[z][j].val);
                     continue;
                 }