diff --git a/app/views/application/_breadcrumbs_and_title.html.slim b/app/views/application/_breadcrumbs_and_title.html.slim
index c78ff5ca..9635c6cb 100644
--- a/app/views/application/_breadcrumbs_and_title.html.slim
+++ b/app/views/application/_breadcrumbs_and_title.html.slim
@@ -18,15 +18,14 @@
 
 - title = "#{active_action} - #{application_name}"
 - content_for :breadcrumbs do
-  - if current_user.try(:admin?) or current_user.try(:teacher?) && !@embed_options[:hide_navbar]
-    .container
-      ul.breadcrumb
-        - if root_element.present?
-          li.breadcrumb-item = root_element
-          - if current_element.present?
-            li.breadcrumb-item = current_element
-            - title = "#{object} - #{title}"
-          - else
-            - title = "#{model.model_name.human(count: 2)} - #{title}"
-        li.breadcrumb-item.active = active_action
+  .container
+    ul.breadcrumb
+      - if root_element.present?
+        li.breadcrumb-item = root_element
+        - if current_element.present?
+          li.breadcrumb-item = current_element
+          - title = "#{object} - #{title}"
+        - else
+          - title = "#{model.model_name.human(count: 2)} - #{title}"
+      li.breadcrumb-item.active = active_action
 - content_for :title, title
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index b27cfb45..ed68d772 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -51,7 +51,8 @@ html lang='en'
               = render('session')
     div data-controller=controller_name
       = render('flash')
-      = yield(:breadcrumbs)
+      - if current_user.try(:admin?) or current_user.try(:teacher?) && !@embed_options[:hide_navbar]
+        = yield(:breadcrumbs)
     - if (controller_name == "exercises" && action_name == "implement")
       .container-fluid
         = yield