diff --git a/src/main/frontend/commands.cljs b/src/main/frontend/commands.cljs
index f82d104681..f9fbe415f3 100644
--- a/src/main/frontend/commands.cljs
+++ b/src/main/frontend/commands.cljs
@@ -194,13 +194,18 @@
   ([type optional]
    (let [format (get state/get-edit-block :block/format :markdown)
          org? (= format :org)
-         left (if org?
+         t (string/lower-case type)
+         markdown-src? (and (= format :markdown) (= t "src"))
+         left (cond
+                markdown-src?
+                "```"
+
+                :else
                 (util/format "#+BEGIN_%s"
-                             (string/upper-case type))
-                (str "```" (let [t (string/lower-case type)] (if (= t "src") "" t))))
-         right (if org?
-                 (util/format "\n#+END_%s" (string/upper-case type))
-                 (str "\n```"))
+                             (string/upper-case type)))
+         right (if markdown-src?
+                 (str "\n```")
+                 (util/format "\n#+END_%s" (string/upper-case type)))
          template (str
                    left
                    (if optional (str " " optional) "")
diff --git a/src/main/frontend/db/utils.cljs b/src/main/frontend/db/utils.cljs
index 159a4a6bd4..6e354d9916 100644
--- a/src/main/frontend/db/utils.cljs
+++ b/src/main/frontend/db/utils.cljs
@@ -37,8 +37,10 @@
 
 (defn group-by-page
   [blocks]
-  (some->> blocks
-           (group-by :block/page)))
+  (if (:block/page (first blocks))
+    (some->> blocks
+             (group-by :block/page))
+    blocks))
 
 (defn group-by-file
   [blocks]