diff --git a/webapp/src/css/enketo/medic.less b/webapp/src/css/enketo/medic.less
index cab277c8482..1b0537e3115 100644
--- a/webapp/src/css/enketo/medic.less
+++ b/webapp/src/css/enketo/medic.less
@@ -18,10 +18,19 @@
     #form-languages {
       display: none;
     }
-    .option-wrapper {
+
+    .dropdown-menu .option-wrapper {
+      padding: 3px;
       .option-label {
+        width: calc(100% - 34px);
+      }
+    }
+
+    .question:not(.or-appearance-likert):not(.or-appearance-columns) .option-wrapper {
+      .option-label.active {
         white-space: normal;
-        word-break: normal;
+        word-break: break-word;
+        display: contents;
       }
     }
   }
@@ -263,7 +272,7 @@
   }
 
   .option-wrapper > label:not(.filler) {
-    margin-right: 10px;
+    margin: 0;
     padding-top: 8px;
     padding-bottom: 8px;
     border-radius: @radius-size-small;
@@ -434,8 +443,6 @@
     .option-wrapper > label:not(.filler) {
       padding-top: 9px;
       padding-bottom: 9px;
-      margin-top: 1px;
-      margin-bottom: 1px;
 
       &:hover {
         background-color: inherit;