diff --git a/public/less/overrides.less b/public/less/overrides.less
index fb6544cd99c..e08e7ab30a2 100644
--- a/public/less/overrides.less
+++ b/public/less/overrides.less
@@ -61,7 +61,7 @@
 }
 
 code, pre {
-  background-color: @grayLighter;
+  background-color: @codeTagBackground;
 }
 
 div.editor-row {
@@ -578,8 +578,10 @@ div.flot-text {
 
 // pre
 code, pre {
-  background-color: @grafanaPanelBackground;
+  background-color: @codeTagBackground;
   color: @textColor;
+  border: 1px solid darken(@codeTagBackground, 15%);
+  padding: 2px;
 }
 
 .dropdown-menu {
diff --git a/public/less/variables.dark.less b/public/less/variables.dark.less
index 3324c3f4b86..783304cd32a 100644
--- a/public/less/variables.dark.less
+++ b/public/less/variables.dark.less
@@ -42,6 +42,7 @@
 @grafanaTargetFuncHightlight: #444;
 
 @modalBackground: @black;
+@codeTagBackground: #444;
 
 // Scaffolding
 // -------------------------
diff --git a/public/less/variables.light.less b/public/less/variables.light.less
index f9063c4cd74..827e2c90b3c 100644
--- a/public/less/variables.light.less
+++ b/public/less/variables.light.less
@@ -55,6 +55,7 @@
 @grafanaTargetFuncHightlight: darken(@grafanaTargetBackground, 10%);
 
 @modalBackground: @bodyBackground;
+@codeTagBackground: #ddd;
 
 // Scaffolding
 // -------------------------