         switch (state)
         {
             case STATE_SCAN: // Band Scanner
+                state_last_used=state;
             case STATE_RSSI_SETUP: // RSSI setup
-
                 // draw selected
                 display.drawRect(0, 0, display.width(), display.height(), WHITE);
                 display.fillRect(0, 0, display.width(), 11, WHITE);

#define STATE_SCAN 2
#define STATE_MANUAL 3
#ifdef USE_DIVERSITY
#define STATE_DIVERSITY 4
#endif
#define STATE_SAVE 5
#define STATE_RSSI_SETUP 6

#define START_STATE STATE_SEEK
#define MAX_STATE STATE_MANUAL

                scan_start=1;
                display.display();
            break;
            case STATE_SEEK: // seek mode
            case STATE_MANUAL: // manual mode
                state_last_used=state;
                display.drawRect(0, 0, display.width(), display.height(), WHITE);
                display.fillRect(0, 0, display.width(), 11, WHITE);
                display.drawRect(0, 10, display.width(), 11, WHITE);
                if (state == STATE_MANUAL)
                {
                    time_screen_saver=millis();
                    display.setTextColor(BLACK);
                    display.setCursor(35,2);
                    display.print("MANUAL MODE");
                }
                else if(state == STATE_SEEK)
                {
                    time_screen_saver=0; // dont show screen saver until we found a channel.
                    display.setCursor(25,2);
                    display.setTextColor(BLACK);
                    display.print("AUTO SEEK MODE");
