diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index ae50df320..7be6c74f3 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -826,6 +826,10 @@ sub prepareShowSurveyTemplate {
     $section->{'showTimeLimit'} = $self->get('showTimeLimit');
     $section->{'minutesLeft'} = int((($self->response->startTime() + (60 * $self->get('timeLimit'))) - time())/60);
 
+    if(scalar @$questions == ($section->{'totalQuestions'} - $section->{'questionsAnswered'})){
+        $section->{isLastPage} = 1
+    }
+
     my $out = $self->processTemplate( $section, $self->get("surveyQuestionsId") );
 
     $self->session->http->setMimeType('application/json');