diff --git a/app/liquid_tags/codesandbox_tag.rb b/app/liquid_tags/codesandbox_tag.rb
index 1f4551771..ca60d698d 100644
--- a/app/liquid_tags/codesandbox_tag.rb
+++ b/app/liquid_tags/codesandbox_tag.rb
@@ -1,4 +1,6 @@
 class CodesandboxTag < LiquidTagBase
+  PARTIAL = "liquids/codesandbox".freeze
+
   def initialize(tag_name, id, tokens)
     super
     @id = parse_id(id)
@@ -6,10 +8,13 @@ class CodesandboxTag < LiquidTagBase
   end
 
   def render(_context)
-    '<iframe src="https://codesandbox.io/embed/' + @id + @query + '"
-      style="width:100%; height:calc(300px + 8vw); border:0; border-radius: 4px; overflow:hidden;"
-      sandbox="allow-same-origin allow-scripts allow-forms allow-top-navigation-by-user-activation>"
-    </iframe>'
+    ActionController::Base.new.render_to_string(
+      partial: PARTIAL,
+      locals: {
+        id: @id,
+        query: @query
+      },
+    )
   end
 
   private
diff --git a/app/views/liquids/_codesandbox.html.erb b/app/views/liquids/_codesandbox.html.erb
new file mode 100644
index 000000000..9a121dbdb
--- /dev/null
+++ b/app/views/liquids/_codesandbox.html.erb
@@ -0,0 +1,5 @@
+<iframe
+  src="<%= "https://codesandbox.io/embed/#{id}#{query}" %>" 
+  style="width:100%; height:calc(300px + 8vw); border:0; border-radius: 4px; overflow:hidden;"
+  sandbox="allow-same-origin allow-scripts allow-forms allow-top-navigation-by-user-activation>"
+</iframe>