diff --git a/js/PageNavModel.js b/js/PageNavModel.js
index b5eeb1e..7b7e3ca 100644
--- a/js/PageNavModel.js
+++ b/js/PageNavModel.js
@@ -30,6 +30,7 @@ class PageNavModel extends ComponentModel {
 
     const buttonTypeModels = this.getButtonTypeModels();
     const currentPageComplete = buttonTypeModels._page.get('_isComplete');
+    const currentPageOptional = buttonTypeModels._page.get('_isOptional');
     const unsortedItems = [];
     let order = 0;
     let item;
@@ -57,7 +58,7 @@ class PageNavModel extends ComponentModel {
         index: 0,
         order: order++,
         _tooltipId: `pagenav_btn${type}`,
-        locked: item._isLocked || (buttonConfig._lockUntilPageComplete && !currentPageComplete)
+        locked: !currentPageOptional && (item._isLocked || (buttonConfig._lockUntilPageComplete && !currentPageComplete)) 
       });
       unsortedItems.push(item);
     }