diff --git a/grafana-plugin/src/containers/RotationForm/RotationForm.tsx b/grafana-plugin/src/containers/RotationForm/RotationForm.tsx
index 1ef816ae..ed02dd3b 100644
--- a/grafana-plugin/src/containers/RotationForm/RotationForm.tsx
+++ b/grafana-plugin/src/containers/RotationForm/RotationForm.tsx
@@ -422,7 +422,12 @@ const RotationForm = observer((props: RotationFormProps) => {
         width="430px"
         onDismiss={onHide}
         contentElement={(props, children) => (
-          <Draggable handle=".drag-handler" defaultClassName={cx('draggable')} positionOffset={{ x: 0, y: offsetTop }}>
+          <Draggable
+            handle=".drag-handler"
+            defaultClassName={cx('draggable')}
+            positionOffset={{ x: 0, y: offsetTop }}
+            bounds={{ top: 0 }}
+          >
             <div {...props}>{children}</div>
           </Draggable>
         )}
diff --git a/grafana-plugin/src/models/schedule/schedule.ts b/grafana-plugin/src/models/schedule/schedule.ts
index 392e2cf3..7fb49671 100644
--- a/grafana-plugin/src/models/schedule/schedule.ts
+++ b/grafana-plugin/src/models/schedule/schedule.ts
@@ -82,7 +82,7 @@ export class ScheduleStore extends BaseStore {
   } = {};
 
   @observable
-  byDayOptions: SelectOption[];
+  byDayOptions: SelectOption[] = [];
 
   @observable
   scheduleId: Schedule['id'];