diff --git a/mod/data/edit.php b/mod/data/edit.php
index 7e410d1ffaa..136000083c7 100755
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -303,9 +303,9 @@ if ($data->addtemplate){
         $patterns[]="[[".$field->field->name."#id]]";
         $replacements[] = 'field_'.$field->field->id;
     }
-    $newtext = str_ireplace($patterns, $replacements, $data->{$mode});    
+    $newtext = str_ireplace($patterns, $replacements, $data->{$mode});
 
-} else {    //if the add template is not yet defined, print the default form!    
+} else {    //if the add template is not yet defined, print the default form!
     echo data_generate_default_template($data, 'addtemplate', $rid, true, false);
     $newtext = '';
 }
@@ -317,7 +317,9 @@ echo '<div class="mdl-align"><input type="submit" name="saveandview" value="'.ge
 if ($rid) {
     echo '&nbsp;<input type="submit" name="cancel" value="'.get_string('cancel').'" onclick="javascript:history.go(-1)" />';
 } else {
-    echo '<input type="submit" value="'.get_string('saveandadd','data').'" />';
+    if ( (!$data->maxentries) || (data_numentries($data)<($data->maxentries-1)) ) {
+        echo '&nbsp;<input type="submit" value="'.get_string('saveandadd','data').'" />';
+    }
 }
 echo '</div>';
 echo $OUTPUT->box_end();
diff --git a/mod/data/tabs.php b/mod/data/tabs.php
index 6f03ebf7b65..65e21ca0ad4 100755
--- a/mod/data/tabs.php
+++ b/mod/data/tabs.php
@@ -49,7 +49,7 @@
     $row[] = new tabobject('asearch', $CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&amp;mode=asearch', get_string('search', 'data'));
 
     if (isloggedin()) { // just a perf shortcut
-        if (data_user_can_add_entry($data, $currentgroup, $groupmode)) { // took out participation list here!
+        if (data_user_can_add_entry($data, $currentgroup, $groupmode) && !data_atmaxentries($data)) { // took out participation list here!
             $addstring = empty($editentry) ? get_string('add', 'data') : get_string('editentry', 'data');
             $row[] = new tabobject('add', $CFG->wwwroot.'/mod/data/edit.php?d='.$data->id, $addstring);
         }