diff --git a/apps/empty_battery_window.cpp b/apps/empty_battery_window.cpp
index 645c81566..ec35f54dd 100644
--- a/apps/empty_battery_window.cpp
+++ b/apps/empty_battery_window.cpp
@@ -1,6 +1,6 @@
 #include "empty_battery_window.h"
-#include "i18n.h"
 #include "global_preferences.h"
+#include "i18n.h"
 extern "C" {
 #include <assert.h>
 }
diff --git a/apps/hardware_test/keyboard_view.cpp b/apps/hardware_test/keyboard_view.cpp
index a502e030f..e1d597dc7 100644
--- a/apps/hardware_test/keyboard_view.cpp
+++ b/apps/hardware_test/keyboard_view.cpp
@@ -21,13 +21,17 @@ Ion::Keyboard::Key KeyboardView::testedKey() const {
 }
 
 void KeyboardView::setDefectiveKey(Ion::Keyboard::Key key) {
-  m_defectiveKey[(int)key] = 1;
+  int keyIndex = (int)key;
+  if (keyIndex < Ion::Keyboard::NumberOfKeys && keyIndex >= 0) {
+    m_defectiveKey[(int)key] = 1;
+  }
 }
 
 bool KeyboardView::setNextKey() {
   m_testedKey = (Ion::Keyboard::Key)((int)m_testedKey+1);
   int keyIndex = (int)m_testedKey;
-  if (keyIndex >= 54) {
+  if (keyIndex == 55) {
+    resetTestedKey();
     return false;
   }
   if ((keyIndex > 7 && keyIndex < 12) || keyIndex == 35 || keyIndex == 41 || keyIndex == 47 || keyIndex == 53) {