diff --git a/src/components/Question.jsx b/src/components/Question.jsx
index 4f121fcf..9f76a2bd 100644
--- a/src/components/Question.jsx
+++ b/src/components/Question.jsx
@@ -146,7 +146,7 @@ export default class Question extends React.Component {
       headerClassName.push(Question.getEmphasizedClass(question));
     if (FormUtils.isSection(question))
       headerClassName.push("section-background");
-    if (collapsible) headerClassName.push("cursor-pointer");
+    if (collapsible) headerClassName.push("pointer");
     if (this.isDebugged(question)) {
       headerClassName.push("show-irrelevant");
     }
@@ -215,31 +215,32 @@ export default class Question extends React.Component {
       return (
         <>
           <Accordion
-            defaultActiveKey={!this.state.expanded ? label : undefined}
+            activeKey={this.state.expanded ? label : undefined}
+            className="mb-3"
           >
-            <Card className="mb-3">
-              <Accordion.Toggle
-                as={Card.Header}
-                onClick={this._toggleCollapse}
-                className={this._getHeaderClassName()}
-                onMouseEnter={this._onMouseEnterHandler}
-                onMouseLeave={this._onMouseLeaveHandler}
-              >
-                <h6 className="d-inline" id={question["@id"]}>
-                  {collapsible &&
-                    !FormUtils.isWizardStep(question) &&
-                    this._renderCollapseToggle()}
-                  {label}
-                </h6>
-                {this.renderQuestionIcons()}
-                {this.props.children}
-              </Accordion.Toggle>
-              {collapsible ? (
-                <Accordion.Collapse>{cardBody}</Accordion.Collapse>
-              ) : (
-                <>{cardBody}</>
-              )}
-            </Card>
+            <Accordion.Item eventKey={label}>
+              <Card className="">
+                <Accordion.Button
+                  as={Card.Header}
+                  onClick={this._toggleCollapse}
+                  className={this._getHeaderClassName()}
+                  onMouseEnter={this._onMouseEnterHandler}
+                  onMouseLeave={this._onMouseLeaveHandler}
+                >
+                  <h6 className="d-inline" id={question["@id"]}>
+                    {collapsible &&
+                      !FormUtils.isWizardStep(question) &&
+                      this._renderCollapseToggle()}
+                    {label}
+                  </h6>
+                  {this.renderQuestionIcons()}
+                  {this.props.children}
+                </Accordion.Button>
+                <Accordion.Body className="p-0">
+                  {collapsible ? cardBody : <>{cardBody}</>}
+                </Accordion.Body>
+              </Card>
+            </Accordion.Item>
           </Accordion>
         </>
       );
diff --git a/src/styles/s-forms.css b/src/styles/s-forms.css
index 34218c0c..485e5ea5 100644
--- a/src/styles/s-forms.css
+++ b/src/styles/s-forms.css
@@ -208,6 +208,14 @@ input:disabled {
   margin-bottom: 0;
 }
 
+.accordion-button::after {
+  background-image: initial;
+}
+
+.accordion-button:not(.collapsed)::after {
+  background-image: initial;
+}
+
 .emphasise-on-relevant-icon {
   animation: emphasiseOnRelevantIcon 0.5s ease-in;
 }