diff --git a/package.json b/package.json
index a4aa7e5d..bfa1283d 100644
--- a/package.json
+++ b/package.json
@@ -339,6 +339,12 @@
           "markdownDescription": "Specify the folder name where all your assets are located. For instance in Hugo this is the `static` folder. [Check in the docs](https://frontmatter.codes/docs/settings/overview#frontmatter.content.publicfolder)",
           "scope": "Content"
         },
+        "frontMatter.snippets.wrapper": {
+          "type": "boolean",
+          "default": true,
+          "markdownDescription": "Specify if you want to wrap the snippets. [Check in the docs](https://frontmatter.codes/docs/settings/overview#frontMatter.snippets.wrapper)",
+          "scope": "Content"
+        },
         "frontMatter.content.snippets": {
           "type": "object",
           "markdownDescription": "Define the snippets you want to use in your content. [Check in the docs](https://frontmatter.codes/docs/settings/overview#frontmatter.content.snippets)",
diff --git a/src/commands/Article.ts b/src/commands/Article.ts
index e1a5e0f5..9da7a049 100644
--- a/src/commands/Article.ts
+++ b/src/commands/Article.ts
@@ -448,6 +448,7 @@ export class Article {
     let snippetInfo: { id: string; fields: any[] } | undefined = undefined;
     let range: SnippetRange | undefined = undefined;
     if (
+      snippetEndAfterPos > -1 &&
       (snippetStartAfterPos > snippetEndAfterPos || snippetStartAfterPos === -1) &&
       snippetStartBeforePos
     ) {
diff --git a/src/constants/settings.ts b/src/constants/settings.ts
index 0e641015..098344db 100644
--- a/src/constants/settings.ts
+++ b/src/constants/settings.ts
@@ -94,6 +94,8 @@ export const SETTING_GIT_SUBMODULE_PUSH = 'git.submodule.push';
 export const SETTING_GIT_SUBMODULE_BRANCH = 'git.submodule.branch';
 export const SETTING_GIT_SUBMODULE_FOLDER = 'git.submodule.folder';
 
+export const SETTING_SNIPPETS_WRAPPER = 'snippets.wrapper';
+
 /**
  * Sponsors only settings
  */
diff --git a/src/dashboardWebView/components/SnippetsView/SnippetForm.tsx b/src/dashboardWebView/components/SnippetsView/SnippetForm.tsx
index 9095cef6..dcc10dd7 100644
--- a/src/dashboardWebView/components/SnippetsView/SnippetForm.tsx
+++ b/src/dashboardWebView/components/SnippetsView/SnippetForm.tsx
@@ -106,8 +106,11 @@ const SnippetForm: React.ForwardRefRenderFunction<SnippetFormHandle, ISnippetFor
       }
 
       if (!onInsert) {
-        if (!snippetKey) {
-          Messenger.send(DashboardMessage.insertSnippet, snippetBody);
+        if (!snippetKey || settings?.snippetsWrapper === false) {
+          Messenger.send(DashboardMessage.insertSnippet, {
+            file: viewData?.data?.filePath,
+            snippet: snippetBody
+          });
         } else {
           Messenger.send(DashboardMessage.insertSnippet, {
             file: viewData?.data?.filePath,
diff --git a/src/dashboardWebView/models/Settings.ts b/src/dashboardWebView/models/Settings.ts
index 978885e6..02de40a6 100644
--- a/src/dashboardWebView/models/Settings.ts
+++ b/src/dashboardWebView/models/Settings.ts
@@ -42,6 +42,7 @@ export interface Settings {
   dataTypes: DataType[] | undefined;
   isBacker: boolean | undefined;
   snippets: Snippets | undefined;
+  snippetsWrapper: boolean;
   date: { format: string };
 }
 
diff --git a/src/helpers/DashboardSettings.ts b/src/helpers/DashboardSettings.ts
index 7e1ca42c..c720e095 100644
--- a/src/helpers/DashboardSettings.ts
+++ b/src/helpers/DashboardSettings.ts
@@ -24,7 +24,8 @@ import {
   SETTING_TAXONOMY_CUSTOM,
   SETTING_TEMPLATES_ENABLED,
   SETTING_GIT_ENABLED,
-  SETTING_DASHBOARD_CONTENT_PAGINATION
+  SETTING_DASHBOARD_CONTENT_PAGINATION,
+  SETTING_SNIPPETS_WRAPPER
 } from '../constants';
 import {
   DashboardViewType,
@@ -119,6 +120,7 @@ export class DashboardSettings {
       dataFiles: await this.getDataFiles(),
       dataTypes: Settings.get<DataType[]>(SETTING_DATA_TYPES),
       snippets: Settings.get<Snippets>(SETTING_CONTENT_SNIPPETS),
+      snippetsWrapper: Settings.get<boolean>(SETTING_SNIPPETS_WRAPPER),
       isBacker: await ext.getState<boolean | undefined>(CONTEXT.backer, 'global')
     } as ISettings;