diff --git a/assets/_shortcodes.scss b/assets/_shortcodes.scss
index 38e105f..70842b5 100644
--- a/assets/_shortcodes.scss
+++ b/assets/_shortcodes.scss
@@ -31,6 +31,10 @@
     padding: $padding-16;
   }
 
+  .book-expand-expander {
+    display: none;
+  }
+
   input[type="checkbox"]:checked + .book-expand-content {
     display: block;
   }
@@ -56,6 +60,10 @@
     cursor: pointer;
   }
 
+  .book-tabs-radio {
+    display: none;
+  }
+
   .book-tabs-content {
     order: 999; //Move content blocks to the end
     width: 100%;
diff --git a/layouts/shortcodes/expand.html b/layouts/shortcodes/expand.html
index 547fb3f..d6b7522 100644
--- a/layouts/shortcodes/expand.html
+++ b/layouts/shortcodes/expand.html
@@ -4,7 +4,7 @@
       <span>{{ default "Expand" (.Get 0) }}</span>
       <span>{{ default "↕" (.Get 1) }}</span>
     </div>
-    <input type="checkbox" style="display: none" />
+    <input type="checkbox" class="book-expand-expander" />
     <div class="book-expand-content markdown-inner">
       {{ .Inner | markdownify }}
     </div>
diff --git a/layouts/shortcodes/tabs.html b/layouts/shortcodes/tabs.html
index 88bb8e7..c49b141 100644
--- a/layouts/shortcodes/tabs.html
+++ b/layouts/shortcodes/tabs.html
@@ -4,7 +4,7 @@
 
 <div class="book-tabs">
 {{ range $index, $tab :=  .Scratch.Get $group }}
-  <input type="radio" name="{{ $group }}" style="display: none;" id="{{ printf "%s-%d" $group $index }}" {{ if not $index }}checked="checked"{{ end }} />
+  <input type="radio" class="book-tabs-radio" name="{{ $group }}" id="{{ printf "%s-%d" $group $index }}" {{ if not $index }}checked="checked"{{ end }} />
   <label for="{{ printf "%s-%d" $group $index }}">
     {{ $tab.Name }}
   </label>