diff --git a/APPL/SCF/scaffolding_search.inc b/APPL/SCF/scaffolding_search.inc
index 87edfdf5c2..4bd7494a12 100644
--- a/APPL/SCF/scaffolding_search.inc
+++ b/APPL/SCF/scaffolding_search.inc
@@ -268,7 +268,7 @@ function scaffolding_search(model, scf_params)
                     var field = model.fields[fld];
                     if (field.hidden || field.typ=="label") // Hidden kun je ook niet aanzetten, en labels idem.
                         continue;
-                    if (!field.label || field.label == '<hidden>')
+                    if (!field.label || field.label == '<hidden>' || !field.dbs)
                         continue;
 
                     var on = inArray(fld, scf_params.list.columns);
diff --git a/APPL/SCF/scaffolding_show.inc b/APPL/SCF/scaffolding_show.inc
index 4ad0b36a85..1c992cbb1f 100644
--- a/APPL/SCF/scaffolding_show.inc
+++ b/APPL/SCF/scaffolding_show.inc
@@ -93,8 +93,10 @@ function scaffolding_show(model, scf_params)
         else
             __Log("Geen printknop want {0} is niet gevonden".format(xslfile));
 
-        if (model.edit.modal) // het is dan vreemd dat we hier zijn. Expliciete showmode
+        if (model.edit.modal|| scf_params.edit && scf_params.edit.modal)
+        {                     // het is dan vreemd dat we hier zijn. Expliciete showmode
             buttons = [];     // zoals fac_usrtab record vanuit materiaal.
+        }
         IFRAMER_HEADER(model.record_title, buttons);
     %>
         <div id="show">