diff --git a/.gitignore b/.gitignore
index 7b8003b30..ec42fe618 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 radio/src/bootloader/.dep/
 radio/src/bootloader/bootloader_ramBoot*
 *.lbm
+*.o
diff --git a/radio/src/.gitignore b/radio/src/.gitignore
index e2ec3ddcd..c03454a65 100644
--- a/radio/src/.gitignore
+++ b/radio/src/.gitignore
@@ -6,7 +6,6 @@
 /snapshot_*.png
 /*.sh
 /*.bat
-/*.o
 /*.bin
 /*.bin.*
 /*.hex
diff --git a/radio/src/bootloader/.gitignore b/radio/src/bootloader/.gitignore
deleted file mode 100755
index cc5bb740f..000000000
--- a/radio/src/bootloader/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.o
diff --git a/radio/src/bootloader/boot.cpp b/radio/src/bootloader/boot.cpp
index 67210e8c6..86ababfbd 100644
--- a/radio/src/bootloader/boot.cpp
+++ b/radio/src/bootloader/boot.cpp
@@ -550,6 +550,10 @@ int main()
       if (state != ST_USB) {
         if (usbPlugged()) {
           state = ST_USB;
+          if (!unlocked) {
+            unlocked = 1;
+            unlockFlash();
+          }
           usbPluggedIn();
         }
       }
@@ -584,6 +588,10 @@ int main()
         lcd_putsLeft(4*FH, "\026USB Connected");
         if (usbPlugged() == 0) {
           vpos = 0;
+          if (unlocked) {
+            lockFlash();
+            unlocked = 0;
+          }
           state = ST_START;
         }
 #if defined(PCBSKY9X)