diff --git a/misc/drupal.js b/misc/drupal.js
index e697fc855b3994e1bbfd1f22e690f22d13e85660..6bbe8fc7439a6bb557f2c816a8ceca4205479b33 100644
--- a/misc/drupal.js
+++ b/misc/drupal.js
@@ -259,7 +259,8 @@ function removeClass(node, className) {
   if (!hasClass(node, className)) {
     return false;
   }
-  node.className = eregReplace('(^| )'+ className +'($| )', '', node.className);
+  // Replaces words surrounded with whitespace or at a string border with a space. Prevents multiple class names from being glued together.
+  node.className = eregReplace('(^|\\s+)'+ className +'($|\\s+)', ' ', node.className);
   return true;
 }