diff --git a/static/partials/repo-admin.html b/static/partials/repo-admin.html
index 80d45768e..172b6d9f8 100644
--- a/static/partials/repo-admin.html
+++ b/static/partials/repo-admin.html
@@ -438,7 +438,9 @@
         </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-primary" ng-disabled="!currentSetupTrigger.$ready" ng-click="finishSetupTrigger(currentSetupTrigger)">Finished</button>
+        <button type="button" class="btn btn-primary"
+                ng-disabled="!currentSetupTrigger.$ready || (!currentSetupTrigger._publicPull && !currentSetupTrigger._pullEntity)"
+                ng-click="finishSetupTrigger(currentSetupTrigger)">Finished</button>
         <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
       </div>
     </div><!-- /.modal-content -->