diff --git a/src/gl/renderer/gl_2ddrawer.cpp b/src/gl/renderer/gl_2ddrawer.cpp
index d95bb9eed..3f4f74cc5 100644
--- a/src/gl/renderer/gl_2ddrawer.cpp
+++ b/src/gl/renderer/gl_2ddrawer.cpp
@@ -487,4 +487,5 @@ void F2DDrawer::Clear()
 {
 	mVertices.Clear();
 	mData.Clear();
+	mLastLineCmd = -1;
 }
diff --git a/src/posix/cocoa/i_input.mm b/src/posix/cocoa/i_input.mm
index 53afa8536..08745e687 100644
--- a/src/posix/cocoa/i_input.mm
+++ b/src/posix/cocoa/i_input.mm
@@ -626,6 +626,11 @@ void ProcessKeyboardFlagsEvent(NSEvent* theEvent)
 
 void ProcessMouseMoveEvent(NSEvent* theEvent)
 {
+	if (!use_mouse)
+	{
+		return;
+	}
+
 	if (GUICapture)
 	{
 		ProcessMouseMoveInMenu(theEvent);
@@ -638,6 +643,11 @@ void ProcessMouseMoveEvent(NSEvent* theEvent)
 
 void ProcessMouseButtonEvent(NSEvent* theEvent)
 {
+	if (!use_mouse)
+	{
+		return;
+	}
+
 	event_t event = {};
 
 	const NSEventType cocoaEventType = [theEvent type];
@@ -690,6 +700,11 @@ void ProcessMouseButtonEvent(NSEvent* theEvent)
 
 void ProcessMouseWheelEvent(NSEvent* theEvent)
 {
+	if (!use_mouse)
+	{
+		return;
+	}
+
 	const int16_t modifiers = ModifierFlagsToGUIKeyModifiers(theEvent);
 	const CGFloat delta   = (modifiers & GKM_SHIFT)
 		? [theEvent deltaX]