diff --git a/pinenote-shell/src/main.js b/pinenote-shell/src/main.js
index bd3c1f8..0ba0cb4 100644
--- a/pinenote-shell/src/main.js
+++ b/pinenote-shell/src/main.js
@@ -288,7 +288,7 @@ function PinenoteShell() {
                         <levelbar
                             vertical
                             class="brightness-levelbar"
-                            value={brightnessLevel((v) => v / 100)}
+                            value={brightnessLevel((v) => Math.max(0, Math.min(1, (v || 0) / 100)))}
                             min={0}
                             max={1}
                         />
@@ -319,8 +319,8 @@ function PinenoteShell() {
                             </button>
                             <box vertical>
                                 <label class="waveform-label" label={currentWaveform} />
-                                <spinbutton
-                                    adjustment={new Gtk.Adjustment({ lower: 0, upper: 3, step_increment: 1 })}
+                                <Gtk.SpinButton
+                                    adjustment={new Gtk.Adjustment({ value: 0, lower: 0, upper: 3, step_increment: 1 })}
                                     digits={0}
                                     onValueChanged={({ value }) => waveform.setWaveform(value)}
                                 />