Index: firmware/App/Modes/ModeUpdate.c
===================================================================
diff -u -r893caf9f58a08a2bd31068806e09603041d64add -rfc99f47309c9d96f73a2d4696b42d6d302f334a7
--- firmware/App/Modes/ModeUpdate.c	(.../ModeUpdate.c)	(revision 893caf9f58a08a2bd31068806e09603041d64add)
+++ firmware/App/Modes/ModeUpdate.c	(.../ModeUpdate.c)	(revision fc99f47309c9d96f73a2d4696b42d6d302f334a7)
@@ -7,6 +7,7 @@
 
 #include "CommBuffers.h"
 #include "Download.h"
+#include "FPGA.h"
 #include "ModeUpdate.h"
 #include "NVDataMgmt.h"
 #include "OperationModes.h"
@@ -85,8 +86,24 @@
 {
     MODE_SW_UPDATE_STATE_T state = SW_UPDATE_VERIFY_STATE;
 
-    requestNewOperationMode( MODE_STAND );
+    switch( getSWUpdateDestination() )
+    {
+        case UPDATE_FPGA:
+            if ( TRUE == isFPGAFlashComplete() )
+            {
+                requestNewOperationMode( MODE_STAND );
+            }
+            break;
 
+        case UPDATE_FIRMWARE:
+            requestNewOperationMode( MODE_STAND );
+            break;
+
+        default:
+            // Do nothing
+            break;
+    }
+
     return state;
 }