diff --git a/app/imports/ui/library/LibraryBrowser.vue b/app/imports/ui/library/LibraryBrowser.vue
index 6d047764..e4e1cd43 100644
--- a/app/imports/ui/library/LibraryBrowser.vue
+++ b/app/imports/ui/library/LibraryBrowser.vue
@@ -183,7 +183,7 @@ export default {
 </script>
 
 <style lang="css">
-.v-expansion-panel-content__wrap, .v-expansion-panel-header {
+.library-browser .v-expansion-panel-content__wrap, .library-browser .v-expansion-panel-header {
   padding: 0 !important;
 }
 </style>
diff --git a/app/imports/ui/properties/forms/shared/FormSection.vue b/app/imports/ui/properties/forms/shared/FormSection.vue
index c8a96507..04d5b3d7 100644
--- a/app/imports/ui/properties/forms/shared/FormSection.vue
+++ b/app/imports/ui/properties/forms/shared/FormSection.vue
@@ -1,28 +1,22 @@
 <template lang="html">
   <form-sections v-if="standalone">
-    <v-expansion-panel-content>
-      <div
-        slot="header"
-        class="subheading"
-      >
+    <v-expansion-panel>
+      <v-expansion-panel-header>
         {{ name }}
-      </div>
-      <v-card-text>
+      </v-expansion-panel-header>
+      <v-expansion-panel-content>
         <slot />
-      </v-card-text>
-    </v-expansion-panel-content>
+      </v-expansion-panel-content>
+    </v-expansion-panel>
   </form-sections>
-  <v-expansion-panel-content v-else>
-    <div
-      slot="header"
-      class="subheading"
-    >
+  <v-expansion-panel v-else>
+    <v-expansion-panel-header>
       {{ name }}
-    </div>
-    <v-card-text>
+    </v-expansion-panel-header>
+    <v-expansion-panel-content>
       <slot />
-    </v-card-text>
-  </v-expansion-panel-content>
+    </v-expansion-panel-content>
+  </v-expansion-panel>
 </template>
 
 <script lang="js">
diff --git a/app/imports/ui/properties/forms/shared/FormSections.vue b/app/imports/ui/properties/forms/shared/FormSections.vue
index a93eabc3..e7e8a738 100644
--- a/app/imports/ui/properties/forms/shared/FormSections.vue
+++ b/app/imports/ui/properties/forms/shared/FormSections.vue
@@ -1,10 +1,10 @@
 <template lang="html">
-  <v-expansion-panel
+  <v-expansion-panels
     popout
-    expand
+    multiple
   >
     <slot />
-  </v-expansion-panel>
+  </v-expansion-panels>
 </template>
 
 <script lang="js">