diff --git a/share/templates/calllistsuppression/list.tt b/share/templates/calllistsuppression/list.tt
index 4e173196ff..d541212157 100644
--- a/share/templates/calllistsuppression/list.tt
+++ b/share/templates/calllistsuppression/list.tt
@@ -2,14 +2,15 @@
-[% back_created = 1 -%]
-
[%
helper.name = c.loc('Call List Suppression');
helper.identifier = "call_list_suppression";
diff --git a/share/templates/device/list.tt b/share/templates/device/list.tt
index 1158c2b484..1012687070 100644
--- a/share/templates/device/list.tt
+++ b/share/templates/device/list.tt
@@ -1,11 +1,12 @@
[%site_config.title = c.loc('Device Management') -%]
-
+[% UNLESS framed -%]
[% back_created = 1 -%]
+[% END -%]
+ [% UNLESS framed -%]
[% back_created = 1 -%]
+ [% END -%]
+