diff --git a/app/src/main/java/rs/ruffle/Keyboard.kt b/app/src/main/java/rs/ruffle/Keyboard.kt
new file mode 100644
index 00000000..2ff43500
--- /dev/null
+++ b/app/src/main/java/rs/ruffle/Keyboard.kt
@@ -0,0 +1,262 @@
+package rs.ruffle
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
+import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.KeyboardArrowDown
+import androidx.compose.material.icons.filled.KeyboardArrowUp
+import androidx.compose.material3.Button
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.em
+import rs.ruffle.ui.theme.RuffleTheme
+
+val BUTTON_ROWS = arrayOf(
+    arrayOf(
+        KeyboardButton(keyCode = 49, keyChar = '1'),
+        KeyboardButton(keyCode = 50, keyChar = '2'),
+        KeyboardButton(keyCode = 51, keyChar = '3'),
+        KeyboardButton(keyCode = 52, keyChar = '4'),
+        KeyboardButton(keyCode = 53, keyChar = '5'),
+        KeyboardButton(keyCode = 54, keyChar = '6'),
+        KeyboardButton(keyCode = 55, keyChar = '7'),
+        KeyboardButton(keyCode = 56, keyChar = '8'),
+        KeyboardButton(keyCode = 57, keyChar = '9'),
+        KeyboardButton(keyCode = 48, keyChar = '0')
+    ),
+    arrayOf(
+        KeyboardButton(keyCode = 81, keyChar = 'q', text = "Q"),
+        KeyboardButton(keyCode = 87, keyChar = 'w', text = "W"),
+        KeyboardButton(keyCode = 69, keyChar = 'e', text = "E"),
+        KeyboardButton(keyCode = 82, keyChar = 'r', text = "R"),
+        KeyboardButton(keyCode = 84, keyChar = 't', text = "T"),
+        KeyboardButton(keyCode = 89, keyChar = 'y', text = "Y"),
+        KeyboardButton(keyCode = 85, keyChar = 'u', text = "U"),
+        KeyboardButton(keyCode = 73, keyChar = 'i', text = "I"),
+        KeyboardButton(keyCode = 79, keyChar = 'o', text = "O"),
+        KeyboardButton(keyCode = 80, keyChar = 'p', text = "P")
+    ),
+    arrayOf(
+        KeyboardButton(keyCode = 65, keyChar = 'a', text = "A"),
+        KeyboardButton(keyCode = 83, keyChar = 's', text = "S"),
+        KeyboardButton(keyCode = 68, keyChar = 'd', text = "D"),
+        KeyboardButton(keyCode = 70, keyChar = 'f', text = "F"),
+        KeyboardButton(keyCode = 71, keyChar = 'g', text = "G"),
+        KeyboardButton(keyCode = 72, keyChar = 'h', text = "H"),
+        KeyboardButton(keyCode = 74, keyChar = 'j', text = "J"),
+        KeyboardButton(keyCode = 75, keyChar = 'k', text = "K"),
+        KeyboardButton(keyCode = 76, keyChar = 'l', text = "L")
+    ),
+    arrayOf(
+        KeyboardButton(keyCode = 90, keyChar = 'z', text = "Z"),
+        KeyboardButton(keyCode = 88, keyChar = 'x', text = "X"),
+        KeyboardButton(keyCode = 67, keyChar = 'c', text = "C"),
+        KeyboardButton(keyCode = 86, keyChar = 'v', text = "V"),
+        KeyboardButton(keyCode = 66, keyChar = 'b', text = "B"),
+        KeyboardButton(keyCode = 78, keyChar = 'n', text = "N"),
+        KeyboardButton(keyCode = 77, keyChar = 'm', text = "M"),
+        KeyboardButton(keyCode = 13, keyChar = '\u000D', text = "↵", size = 5.em)
+    ),
+    arrayOf(
+        KeyboardButton(keyCode = 17, text = "CTRL"),
+        KeyboardButton(keyCode = 18, text = "ALT"),
+        KeyboardButton(keyCode = 32, keyChar = ' ', text = "␣"),
+        KeyboardButton(
+            keyCode = 37,
+            icon = Icons.AutoMirrored.Filled.KeyboardArrowLeft,
+            text = "Left"
+        ),
+        KeyboardButton(keyCode = 38, icon = Icons.Filled.KeyboardArrowUp, text = "Up"),
+        KeyboardButton(keyCode = 40, icon = Icons.Filled.KeyboardArrowDown, text = "Down"),
+        KeyboardButton(
+            keyCode = 39,
+            icon = Icons.AutoMirrored.Filled.KeyboardArrowRight,
+            text = "Right"
+        )
+    )
+)
+
+data class KeyboardButton(
+    val keyCode: Byte,
+    val keyChar: Char = '\u0000',
+    val text: String = keyChar.toString(),
+    val icon: ImageVector? = null,
+    val size: TextUnit = TextUnit.Unspecified
+)
+
+data class ContextMenuItem(
+    val text: String,
+    val separatorBefore: Boolean,
+    val enabled: Boolean,
+    val checked: Boolean,
+    val onClick: () -> Unit
+)
+
+@Composable
+fun OnScreenControls(
+    onKeyClick: (code: Byte, char: Char) -> Unit,
+    onShowContextMenu: () -> Unit,
+    onHideContextMenu: () -> Unit,
+    contextMenuItems: List<ContextMenuItem>
+) {
+    var showKeyboard by rememberSaveable { mutableStateOf(true) }
+    val menuHasAnyCheckmark = contextMenuItems.any { it.checked }
+
+    Surface {
+        Column(modifier = Modifier.padding(horizontal = 1.dp)) {
+            if (showKeyboard) {
+                VirtualKeyboard(onKeyClick)
+            }
+
+            BottomMenu(
+                toggleKeyboard = { showKeyboard = !showKeyboard },
+                onShowContextMenu,
+                contextMenuItems,
+                onHideContextMenu,
+                menuHasAnyCheckmark
+            )
+        }
+    }
+}
+
+@Composable
+private fun BottomMenu(
+    toggleKeyboard: () -> Unit,
+    onShowContextMenu: () -> Unit,
+    contextMenuItems: List<ContextMenuItem>,
+    onHideContextMenu: () -> Unit,
+    menuHasAnyCheckmark: Boolean
+) {
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween
+    ) {
+        Button(
+            onClick = { toggleKeyboard() },
+            contentPadding = PaddingValues(1.dp),
+            shape = RectangleShape
+        ) {
+            Text("⌨")
+        }
+
+        Button(
+            onClick = { onShowContextMenu() },
+            contentPadding = PaddingValues(1.dp),
+            shape = RectangleShape
+        ) {
+            DropdownMenu(
+                expanded = contextMenuItems.isNotEmpty(),
+                onDismissRequest = { onHideContextMenu() }
+            ) {
+                contextMenuItems.forEach {
+                    if (it.separatorBefore) {
+                        HorizontalDivider()
+                    }
+                    DropdownMenuItem(
+                        enabled = it.enabled,
+                        text = {
+                            Row {
+                                if (menuHasAnyCheckmark) {
+                                    if (it.checked) {
+                                        Icon(Icons.Filled.Check, "")
+                                    } else {
+                                        Spacer(
+                                            modifier = Modifier.width(
+                                                Icons.Filled.Check.defaultWidth
+                                            )
+                                        )
+                                    }
+                                }
+                                Text(it.text)
+                            }
+                        },
+                        onClick = { it.onClick() }
+                    )
+                }
+            }
+            Text("▤")
+        }
+    }
+}
+
+@Composable
+private fun VirtualKeyboard(onKeyClick: (code: Byte, char: Char) -> Unit) {
+    Column {
+        BUTTON_ROWS.forEach {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(3.dp)
+            ) {
+                it.forEach {
+                    TextButton(
+                        modifier = Modifier.weight(1f),
+                        button = it,
+                        onKeyClick
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun TextButton(
+    modifier: Modifier,
+    button: KeyboardButton,
+    onKeyClick: (code: Byte, char: Char) -> Unit
+) {
+    Button(
+        modifier = modifier,
+        onClick = {
+            onKeyClick(button.keyCode, button.keyChar)
+        },
+        contentPadding = PaddingValues(1.dp),
+        shape = RectangleShape
+    ) {
+        if (button.icon != null) {
+            Icon(button.icon, contentDescription = button.text)
+        } else {
+            Text(
+                text = button.text,
+                fontSize = button.size
+            )
+        }
+    }
+}
+
+@Preview
+@Composable
+fun OnScreenControlsPreview() {
+    RuffleTheme {
+        OnScreenControls(
+            onKeyClick = { _: Byte, _: Char -> },
+            onShowContextMenu = {},
+            onHideContextMenu = {},
+            contextMenuItems = listOf()
+        )
+    }
+}
diff --git a/app/src/main/java/rs/ruffle/PlayerActivity.kt b/app/src/main/java/rs/ruffle/PlayerActivity.kt
index 5f223f5a..cb1b33e1 100644
--- a/app/src/main/java/rs/ruffle/PlayerActivity.kt
+++ b/app/src/main/java/rs/ruffle/PlayerActivity.kt
@@ -1,23 +1,20 @@
 package rs.ruffle
 
-import android.annotation.SuppressLint
 import android.content.Intent
-import android.content.res.Configuration
 import android.net.Uri
 import android.os.Build
 import android.os.Build.VERSION_CODES
 import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
-import android.view.MotionEvent
-import android.view.View
 import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
-import android.widget.Button
-import android.widget.PopupMenu
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.ViewCompat
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowColumn
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
@@ -25,6 +22,7 @@ import com.google.androidgamesdk.GameActivity
 import java.io.DataInputStream
 import java.io.File
 import java.io.IOException
+import rs.ruffle.ui.theme.RuffleTheme
 
 class PlayerActivity : GameActivity() {
     @Suppress("unused")
@@ -93,6 +91,8 @@ class PlayerActivity : GameActivity() {
     private val surfaceHeight: Int
         get() = mSurfaceView.height
 
+    private var contextMenuItems = mutableStateListOf<ContextMenuItem>()
+
     private external fun keydown(keyCode: Byte, keyChar: Char)
     private external fun keyup(keyCode: Byte, keyChar: Char)
     private external fun requestContextMenu()
@@ -101,40 +101,40 @@ class PlayerActivity : GameActivity() {
 
     @Suppress("unused")
     // Used by Rust
-    private fun showContextMenu(items: Array<String>) {
+    private fun setContextMenu(items: Array<String>) {
         runOnUiThread {
-            val popup = PopupMenu(this, findViewById(R.id.button_cm))
-            val menu = popup.menu
-            if (Build.VERSION.SDK_INT >= VERSION_CODES.P) {
-                menu.setGroupDividerEnabled(true)
-            }
-            var group = 1
+            contextMenuItems.clear()
             for (i in items.indices) {
                 val elements = items[i].split(" ".toRegex(), limit = 4).toTypedArray()
                 val enabled = elements[0].toBoolean()
                 val separatorBefore = elements[1].toBoolean()
                 val checked = elements[2].toBoolean()
                 val caption = elements[3]
-                if (separatorBefore) group += 1
-                val item = menu.add(group, i, Menu.NONE, caption)
-                item.setEnabled(enabled)
-                if (checked) {
-                    item.setCheckable(true)
-                    item.setChecked(true)
-                }
-            }
-            val exitItemId: Int = items.size
-            menu.add(group, exitItemId, Menu.NONE, "Exit")
-            popup.setOnMenuItemClickListener { item: MenuItem ->
-                if (item.itemId == exitItemId) {
-                    finish()
-                } else {
-                    runContextMenuCallback(item.itemId)
-                }
-                true
+                contextMenuItems.add(
+                    ContextMenuItem(
+                        text = caption,
+                        separatorBefore = separatorBefore,
+                        enabled = enabled,
+                        checked = checked,
+                        onClick = {
+                            runContextMenuCallback(i)
+                            clearContextMenu()
+                            contextMenuItems.clear()
+                        }
+                    )
+                )
             }
-            popup.setOnDismissListener { clearContextMenu() }
-            popup.show()
+            contextMenuItems.add(
+                ContextMenuItem(
+                    text = "Exit",
+                    separatorBefore = true,
+                    enabled = true,
+                    checked = false,
+                    onClick = {
+                        finish()
+                    }
+                )
+            )
         }
     }
 
@@ -150,65 +150,6 @@ class PlayerActivity : GameActivity() {
         return storageDirPath
     }
 
-    override fun onCreateSurfaceView() {
-        val inflater = layoutInflater
-
-        @SuppressLint("InflateParams")
-        val layout = inflater.inflate(R.layout.keyboard, null) as ConstraintLayout
-
-        contentViewId = ViewCompat.generateViewId()
-        layout.id = contentViewId
-        setContentView(layout)
-        mSurfaceView = InputEnabledSurfaceView(this)
-
-        mSurfaceView.contentDescription = "Ruffle Player"
-
-        val placeholder = findViewById<View>(R.id.placeholder)
-        val pars = placeholder.layoutParams as ConstraintLayout.LayoutParams
-        val parent = placeholder.parent as ViewGroup
-        val index = parent.indexOfChild(placeholder)
-        parent.removeView(placeholder)
-        parent.addView(mSurfaceView, index)
-        mSurfaceView.setLayoutParams(pars)
-        val keys = gatherAllDescendantsOfType<Button>(
-            layout.getViewById(R.id.keyboard),
-            Button::class.java
-        )
-        for (b in keys) {
-            b.setOnTouchListener { view: View, motionEvent: MotionEvent ->
-                val tag = view.tag as String
-                val spl = tag.split(" ".toRegex(), limit = 2).toTypedArray()
-                val by = spl[0].toByte()
-                val c: Char = if (spl.size > 1) spl[1][0] else Char.MIN_VALUE
-                if (motionEvent.action == MotionEvent.ACTION_DOWN) keydown(by, c)
-                if (motionEvent.action == MotionEvent.ACTION_UP) keyup(by, c)
-                view.performClick()
-                false
-            }
-        }
-        layout.findViewById<View>(R.id.button_kb).setOnClickListener {
-            val keyboard = layout.getViewById(R.id.keyboard)
-            if (keyboard.visibility == View.VISIBLE) {
-                keyboard.visibility = View.GONE
-            } else {
-                keyboard.visibility = View.VISIBLE
-            }
-        }
-        layout.findViewById<View>(R.id.button_cm)
-            .setOnClickListener { requestContextMenu() }
-        layout.requestLayout()
-        layout.requestFocus()
-        mSurfaceView.holder.addCallback(this)
-        ViewCompat.setOnApplyWindowInsetsListener(mSurfaceView, this)
-    }
-
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        val keyboard = findViewById<View>(R.id.keyboard)
-        val isLandscape = newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE
-        keyboard.visibility = if (isLandscape) View.GONE else View.VISIBLE
-    }
-
     private fun hideSystemUI() {
         // This will put the game behind any cutouts and waterfalls on devices which have
         // them, so the corresponding insets will be non-zero.
@@ -229,6 +170,7 @@ class PlayerActivity : GameActivity() {
             WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
     }
 
+    @OptIn(ExperimentalLayoutApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         // When true, the app will fit inside any system UI windows.
         // When false, we render behind any system UI windows.
@@ -241,6 +183,33 @@ class PlayerActivity : GameActivity() {
         requestNoStatusBarFeature()
         supportActionBar?.hide()
         super.onCreate(savedInstanceState)
+
+        (mSurfaceView.parent as ViewGroup).removeView(mSurfaceView)
+
+        setContent {
+            RuffleTheme {
+                FlowColumn(
+                    modifier = Modifier.fillMaxSize()
+                ) {
+                    AndroidView(
+                        modifier = Modifier.weight(1f),
+                        factory = { mSurfaceView }
+                    )
+                    OnScreenControls(
+                        onKeyClick = { keyCode: Byte, keyChar: Char ->
+                            keydown(keyCode, keyChar)
+                            keyup(keyCode, keyChar)
+                        },
+                        onShowContextMenu = { requestContextMenu() },
+                        onHideContextMenu = {
+                            clearContextMenu()
+                            contextMenuItems.clear()
+                        },
+                        contextMenuItems = contextMenuItems
+                    )
+                }
+            }
+        }
     }
 
     // Used by Rust
@@ -269,17 +238,5 @@ class PlayerActivity : GameActivity() {
 
         @JvmStatic
         private external fun nativeInit()
-
-        private fun <T> gatherAllDescendantsOfType(v: View, t: Class<*>): List<T> {
-            val result: MutableList<T> = ArrayList()
-            @Suppress("UNCHECKED_CAST")
-            if (t.isInstance(v)) result.add(v as T)
-            if (v is ViewGroup) {
-                for (i in 0 until v.childCount) {
-                    result.addAll(gatherAllDescendantsOfType(v.getChildAt(i), t))
-                }
-            }
-            return result
-        }
     }
 }
diff --git a/app/src/main/res/layout/keyboard.xml b/app/src/main/res/layout/keyboard.xml
deleted file mode 100644
index ae1f5540..00000000
--- a/app/src/main/res/layout/keyboard.xml
+++ /dev/null
@@ -1,432 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/topLevel"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:ignore="HardcodedText">
-
-    <SurfaceView
-        android:id="@+id/placeholder"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/keyboard"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <LinearLayout
-        android:id="@+id/keyboard"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="64dp"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/placeholder">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/button_1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="49 1"
-                android:text="1" />
-
-            <Button
-                android:id="@+id/button_2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="50 2"
-                android:text="2" />
-
-            <Button
-                android:id="@+id/button_3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="51 3"
-                android:text="3" />
-
-            <Button
-                android:id="@+id/button_4"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="52 4"
-                android:text="4" />
-
-            <Button
-                android:id="@+id/button_5"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="53 5"
-                android:text="5" />
-
-            <Button
-                android:id="@+id/button_6"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="54 6"
-                android:text="6" />
-
-            <Button
-                android:id="@+id/button_7"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="55 7"
-                android:text="7" />
-
-            <Button
-                android:id="@+id/button_8"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="56 8"
-                android:text="8" />
-
-            <Button
-                android:id="@+id/button_9"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="57 9"
-                android:text="9" />
-
-            <Button
-                android:id="@+id/button_0"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="48 0"
-                android:text="0" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/button_q"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="81 q"
-                android:text="Q" />
-
-            <Button
-                android:id="@+id/button_w"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="87 w"
-                android:text="W" />
-
-            <Button
-                android:id="@+id/button_e"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="69 e"
-                android:text="E" />
-
-            <Button
-                android:id="@+id/button_r"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="82 r"
-                android:text="R" />
-
-            <Button
-                android:id="@+id/button_t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="84 t"
-                android:text="T" />
-
-            <Button
-                android:id="@+id/button_y"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="89 y"
-                android:text="Y" />
-
-            <Button
-                android:id="@+id/button_u"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="85 u"
-                android:text="U" />
-
-            <Button
-                android:id="@+id/button_i"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="73 i"
-                android:text="I" />
-
-            <Button
-                android:id="@+id/button_o"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="79 o"
-                android:text="O" />
-
-            <Button
-                android:id="@+id/button_p"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="80 p"
-                android:text="P" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/button_a"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="65 a"
-                android:text="A" />
-
-            <Button
-                android:id="@+id/button_s"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="83 s"
-                android:text="S" />
-
-            <Button
-                android:id="@+id/button_d"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="68 d"
-                android:text="D" />
-
-            <Button
-                android:id="@+id/button_f"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="70 f"
-                android:text="F" />
-
-            <Button
-                android:id="@+id/button_g"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="71 g"
-                android:text="G" />
-
-            <Button
-                android:id="@+id/button_h"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="72 h"
-                android:text="H" />
-
-            <Button
-                android:id="@+id/button_j"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="74 j"
-                android:text="J" />
-
-            <Button
-                android:id="@+id/button_k"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="75 k"
-                android:text="K" />
-
-            <Button
-                android:id="@+id/button_l"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="76 l"
-                android:text="L" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/button_z"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="90 z"
-                android:text="Z" />
-
-            <Button
-                android:id="@+id/button_x"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="88 x"
-                android:text="X" />
-
-            <Button
-                android:id="@+id/button_c"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="67 c"
-                android:text="C" />
-
-            <Button
-                android:id="@+id/button_v"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="86 v"
-                android:text="V" />
-
-            <Button
-                android:id="@+id/button_b"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="66 b"
-                android:text="B" />
-
-            <Button
-                android:id="@+id/button_n"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="78 n"
-                android:text="N" />
-
-            <Button
-                android:id="@+id/button_m"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="77 m"
-                android:text="M" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/button_ctrl"
-                android:layout_width="120dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="17"
-                android:text="CTRL" />
-
-            <Button
-                android:id="@+id/button_alt"
-                android:layout_width="100dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="18"
-                android:text="ALT" />
-
-            <Button
-                android:id="@+id/button_space"
-                android:layout_width="150dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="32  "
-                android:text="_" />
-
-            <Button
-                android:id="@+id/button_left"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="37"
-                android:text="(" />
-
-            <Button
-                android:id="@+id/button_up"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="38"
-                android:text="^" />
-
-            <Button
-                android:id="@+id/button_down"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="40"
-                android:text="v" />
-
-            <Button
-                android:id="@+id/button_right"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:tag="39"
-                android:text=")" />
-
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/toolbar"
-        android:layout_width="0dp"
-        android:layout_height="64dp"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
-
-        <Button
-            android:id="@+id/button_kb"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:tag="kb"
-            android:text="⌨" />
-
-        <Button
-            android:id="@+id/button_cm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:checkable="true"
-            android:tag="cm"
-            android:text="▤" />
-
-    </LinearLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/java.rs b/src/java.rs
index abbb650f..1b832bcb 100644
--- a/src/java.rs
+++ b/src/java.rs
@@ -14,7 +14,7 @@ use std::sync::OnceLock;
 pub struct JavaInterface {
     get_surface_width: JMethodID,
     get_surface_height: JMethodID,
-    show_context_menu: JMethodID,
+    set_context_menu: JMethodID,
     get_swf_bytes: JMethodID,
     get_swf_uri: JMethodID,
     get_trace_output: JMethodID,
@@ -55,7 +55,7 @@ impl JavaInterface {
             .unwrap()
     }
 
-    pub fn show_context_menu(env: &mut JNIEnv, this: &JObject, items: &[ContextMenuItem]) {
+    pub fn set_context_menu(env: &mut JNIEnv, this: &JObject, items: &[ContextMenuItem]) {
         let arr = env
             .new_object_array(items.len() as i32, "java/lang/String", JObject::null())
             .unwrap();
@@ -71,12 +71,12 @@ impl JavaInterface {
         let result = unsafe {
             env.call_method_unchecked(
                 this,
-                Self::get().show_context_menu,
+                Self::get().set_context_menu,
                 ReturnType::Primitive(Primitive::Void),
                 &[JValue::Object(&arr).as_jni()],
             )
         };
-        result.expect("showContextMenu() must never throw");
+        result.expect("setContextMenu() must never throw");
     }
 
     pub fn get_swf_bytes(env: &mut JNIEnv, this: &JObject) -> Option<Vec<u8>> {
@@ -180,9 +180,9 @@ impl JavaInterface {
                 get_surface_height: env
                     .get_method_id(class, "getSurfaceHeight", "()I")
                     .expect("getSurfaceHeight must exist"),
-                show_context_menu: env
-                    .get_method_id(class, "showContextMenu", "([Ljava/lang/String;)V")
-                    .expect("showContextMenu must exist"),
+                set_context_menu: env
+                    .get_method_id(class, "setContextMenu", "([Ljava/lang/String;)V")
+                    .expect("setContextMenu must exist"),
                 get_swf_bytes: env
                     .get_method_id(class, "getSwfBytes", "()[B")
                     .expect("getSwfBytes must exist"),
diff --git a/src/lib.rs b/src/lib.rs
index c85c1aa5..9513cd74 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -117,6 +117,9 @@ async fn run(app: AndroidApp) {
                             }
                             quit = true;
                         }
+                        MainEvent::RedrawNeeded { .. } => {
+                            needs_redraw = true;
+                        }
                         MainEvent::WindowResized { .. } => {
                             if let Some(player) = playerbox.as_ref() {
                                 let mut player_lock = player.player.lock().unwrap();
@@ -437,7 +440,7 @@ async fn run(app: AndroidApp) {
                     let items = player.player.lock().unwrap().prepare_context_menu();
                     let (jvm, activity) = get_jvm().unwrap();
                     let mut env = jvm.attach_current_thread().unwrap();
-                    JavaInterface::show_context_menu(&mut env, &activity, &items);
+                    JavaInterface::set_context_menu(&mut env, &activity, &items);
                 }
             }
         }