diff --git a/src/StateMachine.cpp b/src/StateMachine.cpp
index b44248e..10905c7 100644
--- a/src/StateMachine.cpp
+++ b/src/StateMachine.cpp
@@ -86,7 +86,12 @@ void StateMachine::update()
         if (button_selectVI.longPressedFlag) // Long press
         {
             button_selectVI.clearLongPressedFlag();
-            transitionTo(State::NORMAL_PPS);
+            if (menu.menuPosition == usbpd.getPPSIndex()) {
+                transitionTo(State::NORMAL_PPS);
+            } else {
+                forceSave = true;
+                transitionTo(State::NORMAL_PDO);
+            }   
         }
         if (button_encoder.longPressedFlag) // Long press
         {