diff --git a/htdocs/lib/settings/BookmarkTable.js b/htdocs/lib/settings/BookmarkTable.js
index 5594fc6..66a8975 100644
--- a/htdocs/lib/settings/BookmarkTable.js
+++ b/htdocs/lib/settings/BookmarkTable.js
@@ -79,8 +79,8 @@ $.fn.bookmarktable = function() {
                 } else {
                     cell.html(
                         '<div class="btn-group btn-group-sm">' +
-                            '<button class="btn btn-primary bookmark-save">Save</button>' +
-                            '<button class="btn btn-secondary bookmark-cancel">Cancel</button>' +
+                            '<button type="button" class="btn btn-primary bookmark-save">Save</button>' +
+                            '<button type="button" class="btn btn-secondary bookmark-cancel">Cancel</button>' +
                         '</div>'
                     );
                 }
diff --git a/htdocs/lib/settings/WsjtDecodingDepthsInput.js b/htdocs/lib/settings/WsjtDecodingDepthsInput.js
index 5a2ddf4..f02b27f 100644
--- a/htdocs/lib/settings/WsjtDecodingDepthsInput.js
+++ b/htdocs/lib/settings/WsjtDecodingDepthsInput.js
@@ -5,7 +5,7 @@ $.fn.wsjtDecodingDepthsInput = function() {
         this.modeInput.val(mode);
         this.valueInput = $(inputs.get(1)).clone();
         this.valueInput.val(value);
-        this.removeButton = $('<button class="btn btn-sm btn-danger remove">Remove</button>');
+        this.removeButton = $('<button type="button" class="btn btn-sm btn-danger remove">Remove</button>');
         this.removeButton.data('row', this);
         this.el.append([this.modeInput, this.valueInput, this.removeButton].map(function(i) {
             return $('<td>').append(i);
@@ -46,7 +46,7 @@ $.fn.wsjtDecodingDepthsInput = function() {
 
         $table.on('change', updateValue);
         $el.append($table);
-        var $addButton = $('<button class="btn btn-sm btn-primary">Add...</button>');
+        var $addButton = $('<button type="button" class="btn btn-sm btn-primary">Add...</button>');
 
         $addButton.on('click', function() {
             var row = new WsjtDecodingDepthRow(inputs)
diff --git a/htdocs/settings/bookmarks.html b/htdocs/settings/bookmarks.html
index 7518427..185d664 100644
--- a/htdocs/settings/bookmarks.html
+++ b/htdocs/settings/bookmarks.html
@@ -20,7 +20,7 @@ ${header}
     <div class="bookmarks">
         ${bookmarks}
         <div class="buttons container">
-            <button class="btn btn-primary bookmark-add">Add a new bookmark</button>
+            <button type="button" class="btn btn-primary bookmark-add">Add a new bookmark</button>
         </div>
     </div>
 </div>
diff --git a/owrx/controllers/settings/bookmarks.py b/owrx/controllers/settings/bookmarks.py
index 83c9840..4e802e1 100644
--- a/owrx/controllers/settings/bookmarks.py
+++ b/owrx/controllers/settings/bookmarks.py
@@ -55,7 +55,7 @@ class BookmarksController(AuthorizationMixin, WebpageController):
                 <td class="frequency">{frequency}</td>
                 <td data-value="{modulation}">{modulation_name}</td>
                 <td>
-                    <button class="btn btn-sm btn-danger bookmark-delete">delete</button>
+                    <button type="button" class="btn btn-sm btn-danger bookmark-delete">delete</button>
                 </td>
             </tr>
         """.format(
diff --git a/owrx/form/__init__.py b/owrx/form/__init__.py
index 3e828fe..f53cc00 100644
--- a/owrx/form/__init__.py
+++ b/owrx/form/__init__.py
@@ -42,7 +42,7 @@ class Input(ABC):
             input=input,
             infotext=infotext,
             removable="removable" if self.removable else "",
-            removebutton='<button class="btn btn-sm btn-danger option-remove-button">Remove</button>'
+            removebutton='<button type="button" class="btn btn-sm btn-danger option-remove-button">Remove</button>'
             if self.removable
             else "",
         )
diff --git a/owrx/form/device.py b/owrx/form/device.py
index e4b5165..767a010 100644
--- a/owrx/form/device.py
+++ b/owrx/form/device.py
@@ -227,7 +227,7 @@ class SchedulerInput(Input):
                 <div class="row scheduler-static-time-inputs">
                     {time_inputs}
                     {select}
-                    <button class="btn btn-sm btn-danger remove-button">X</button>
+                    <button type="button" class="btn btn-sm btn-danger remove-button">X</button>
                 </div>
             """.format(
                 time_inputs=render_time_inputs(slot),
@@ -241,10 +241,10 @@ class SchedulerInput(Input):
             <div class="row scheduler-static-time-inputs template" style="display: none;">
                 {time_inputs}
                 {select}
-                <button class="btn btn-sm btn-danger remove-button">X</button>
+                <button type="button" class="btn btn-sm btn-danger remove-button">X</button>
             </div>
             <div class="row">
-                <button class="btn btn-sm btn-primary col-12 add-button">Add...</button>
+                <button type="button" class="btn btn-sm btn-primary col-12 add-button">Add...</button>
             </div>
         """.format(
             rows=rows,
diff --git a/owrx/form/gfx.py b/owrx/form/gfx.py
index 99a2ca6..c4d766d 100644
--- a/owrx/form/gfx.py
+++ b/owrx/form/gfx.py
@@ -11,8 +11,8 @@ class ImageInput(Input, metaclass=ABCMeta):
                 <div class="image-container">
                     <img class="{classes}" src="{url}" alt="{label}"/>
                 </div>
-                <button class="btn btn-primary upload">Upload new image...</button>
-                <button class="btn btn-secondary restore">Restore original image</button>
+                <button type="button" class="btn btn-primary upload">Upload new image...</button>
+                <button type="button" class="btn btn-secondary restore">Restore original image</button>
             </div>
         """.format(
             id=self.id, label=self.label, url=self.cachebuster(self.getUrl()), classes=" ".join(self.getImgClasses())
diff --git a/owrx/source/__init__.py b/owrx/source/__init__.py
index ca052e0..e752f09 100644
--- a/owrx/source/__init__.py
+++ b/owrx/source/__init__.py
@@ -415,7 +415,7 @@ class OptionalSection(Section):
                         {options}
                     </select>
                     <div class="input-group-append">
-                        <button class="btn btn-success option-add-button">Add</button>
+                        <button type="button" class="btn btn-success option-add-button">Add</button>
                     </div>
                 </div>
             </div>