Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r814e18d5ba31fa8e35d76e095369d56dd5c70fac -ra80f37fe93d9579554e12008bd74ac7b563f80a1
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 814e18d5ba31fa8e35d76e095369d56dd5c70fac)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision a80f37fe93d9579554e12008bd74ac7b563f80a1)
@@ -537,24 +537,40 @@
  *************************************************************************/
 GENERIC_CONFIRM_ID_T addConfirmationRequest( GENERIC_CONFIRM_ID_T requestID, GENERIC_CONFIRM_COMMAND_T requestType, U32 rejectReason )
 {
-    U32 i;
+    U32  i;
+    BOOL confirmAlreadyPending = FALSE;
     GENERIC_CONFIRM_ID_T newID = GENERIC_CONFIRM_ID_NONE;
 
+    // Check to make sure specified confirmation is not already pending
     for ( i = 0; i < MAX_PENDING_CONFIRM_REQUESTS; i++ )
     {
-        if ( CONFIRMATION_REQUEST_STATUS_UNUSED == confirmRequests[ i ].status )
+        if ( ( confirmRequests[ i ].requestID == requestID ) &&
+             ( confirmRequests[ i ].status != CONFIRMATION_REQUEST_STATUS_UNUSED ) )
         {
-            // Save the confirmation request info
-            confirmRequests[ i ].requestID = requestID;
-            confirmRequests[ i ].requestType = requestType;
-            confirmRequests[ i ].timeStamp = getMSTimerCount();
-            confirmRequests[ i ].status = CONFIRMATION_REQUEST_STATUS_PENDING;
-            newID = requestID;
-            sendConfirmationRequest( requestID, requestType, rejectReason );
+            confirmAlreadyPending = TRUE;
             break;
         }
     }
 
+    // If not already pending, add confirmation to list of pending confirmations and send to UI to be displayed
+    if ( confirmAlreadyPending != TRUE )
+    {
+        for ( i = 0; i < MAX_PENDING_CONFIRM_REQUESTS; i++ )
+        {
+            if ( CONFIRMATION_REQUEST_STATUS_UNUSED == confirmRequests[ i ].status )
+            {
+                // Save the confirmation request info
+                confirmRequests[ i ].requestID = requestID;
+                confirmRequests[ i ].requestType = requestType;
+                confirmRequests[ i ].timeStamp = getMSTimerCount();
+                confirmRequests[ i ].status = CONFIRMATION_REQUEST_STATUS_PENDING;
+                newID = requestID;
+                sendConfirmationRequest( requestID, requestType, rejectReason );
+                break;
+            }
+        }
+    }
+
     return newID;
 }