diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterPanelScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterPanelScreen.kt
index 0ac028c7d..2e0462994 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterPanelScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterPanelScreen.kt
@@ -253,7 +253,7 @@ class MatterPanelScreen(
 	private fun openTask(task: IReplicationTask<*>): FramePanel<MatterPanelScreen> {
 		val frame = FramePanel.padded(this, null, 170f, 20f, TranslatableComponent("otm.gui.matter_panel.task"))
 
-		frame.closeOnEscape = true
+		frame.behaveAsWindow()
 
 		object : AbstractSlotPanel<MatterPanelScreen>(this@MatterPanelScreen, frame) {
 			init {
@@ -299,7 +299,7 @@ class MatterPanelScreen(
 	private fun openPattern(pattern: IPatternState): FramePanel<MatterPanelScreen> {
 		val frame = FramePanel.padded(this, null, 213f, (ButtonPanel.HEIGHT + 3f) * 4f + 38f, TranslatableComponent("otm.gui.matter_panel.task"))
 
-		frame.closeOnEscape = true
+		frame.behaveAsWindow()
 
 		val rowTop = EditablePanel(this, frame, height = ButtonPanel.HEIGHT)
 		val rowInput = EditablePanel(this, frame, height = ButtonPanel.HEIGHT)