diff --git a/emacs/.emacs.d/50-general.org b/emacs/.emacs.d/50-general.org
index 2c92424bb..94b842bc2 100644
--- a/emacs/.emacs.d/50-general.org
+++ b/emacs/.emacs.d/50-general.org
@@ -2778,7 +2778,7 @@ Inherit Clojure snippets.
   # --
   # -*- mode: snippet; -*-
   # name: ${1:Snippet name}
-  # key: ${2:`(let ((buffer-name (buffer-name))) (if (not (string= buffer-name yas-new-snippet-buffer-name)) buffer-name "key"))`}
+  # key: ${2:`(let ((buffer-name (buffer-name))) (if (or (string= buffer-name yas-new-snippet-buffer-name) (string-match-p (rx "*org-src: " (one-or-more not-newline) "*") buffer-name)) "key" buffer-name))`}
   # --
   $0
 #+END_SRC
diff --git a/emacs/.emacs.d/etc/yasnippet/snippets/snippet-mode/new b/emacs/.emacs.d/etc/yasnippet/snippets/snippet-mode/new
index 050d88523..a3b23f45f 100644
--- a/emacs/.emacs.d/etc/yasnippet/snippets/snippet-mode/new
+++ b/emacs/.emacs.d/etc/yasnippet/snippets/snippet-mode/new
@@ -4,6 +4,6 @@
 # --
 # -*- mode: snippet; -*-
 # name: ${1:Snippet name}
-# key: ${2:`(let ((buffer-name (buffer-name))) (if (not (string= buffer-name yas-new-snippet-buffer-name)) buffer-name "key"))`}
+# key: ${2:`(let ((buffer-name (buffer-name))) (if (or (string= buffer-name yas-new-snippet-buffer-name) (string-match-p (rx "*org-src: " (one-or-more not-newline) "*") buffer-name)) "key" buffer-name))`}
 # --
 $0
\ No newline at end of file