diff --git a/ReactNativeClient/lib/joplin-renderer/noteStyle.js b/ReactNativeClient/lib/joplin-renderer/noteStyle.js
index 9d9087af8..e9ca1ddb4 100644
--- a/ReactNativeClient/lib/joplin-renderer/noteStyle.js
+++ b/ReactNativeClient/lib/joplin-renderer/noteStyle.js
@@ -238,7 +238,7 @@ module.exports = function(theme) {
 		}
 		
 		.inline-code,
-		.tox :not(.joplin-editable) code {
+		.mce-content-body code {
 			border: 1px solid ${theme.htmlCodeBorderColor};
 			background-color: ${theme.htmlCodeBackgroundColor};
 			padding-right: .2em;
@@ -303,9 +303,11 @@ module.exports = function(theme) {
 			padding: 5px 10px 10em 10px;
 		}
 
+		/*
 		.mce-content-body code {
 			background-color: transparent;
 		}
+		*/
 
 		.mce-content-body [data-mce-selected=inline-boundary] {
 			background-color: transparent;
@@ -324,6 +326,15 @@ module.exports = function(theme) {
 			pointer-events: none;
 		}
 
+		/* Clear the CODE style if the element is within a joplin-editable block */
+		.mce-content-body .joplin-editable code {
+			border: none;
+			background: none;
+			padding: 0;
+			color: inherit;
+			font-size: inherit;
+		}
+
 		/* =============================================== */
 		/* For TinyMCE */
 		/* =============================================== */