diff --git a/css/questionset.css b/css/questionset.css
index a9eb1fc..8f089a6 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -120,10 +120,6 @@
   content: "\f01e";
 }
 
-.qs-footer > .next, .qs-footer > .finish, .qs-finishbutton {
-  float: right;
-}
-
 /* Need to disable max-height animation stuff, since this will
    make resizing of iframe in Safari not work! */
 .questionset .h5p-question-buttons.h5p-question-visible {
@@ -178,10 +174,6 @@
   left: -2px;
 }
 
-.questionset-results .qs-finishbutton {
-  display: none;
-}
-
 .h5p-question .h5p-question-finish:before {
   content: "\f00c";
 }
diff --git a/js/questionset.js b/js/questionset.js
index d0a8fbd..00a06be 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -125,7 +125,6 @@ H5P.QuestionSet = function (options, contentId, contentData) {
           '  <div class="result-text"><%= resulttext %></div>' +
           '  <% } %>' +
           '  <div class="buttons">' +
-          '    <button type="button" class="h5p-joubelui-button h5p-button qs-finishbutton"><%= finishButtonText %></button>' +
           solutionButtonTemplate +
           '    <button type="button" class="h5p-joubelui-button h5p-button qs-retrybutton"><%= retryButtonText %></button>' +
           '  </div>' +
@@ -795,7 +794,7 @@ H5P.QuestionSet = function (options, contentId, contentData) {
       }
       else {
         // Remove buttons and feedback section
-        $('.qs-finishbutton, .qs-solutionbutton, .qs-retrybutton, .feedback-section', $myDom).remove();
+        $('.qs-solutionbutton, .qs-retrybutton, .feedback-section', $myDom).remove();
       }
 
       self.trigger('resize');