diff --git a/frontend/device/android/device.lua b/frontend/device/android/device.lua
index caf88be99..0a52fc11b 100644
--- a/frontend/device/android/device.lua
+++ b/frontend/device/android/device.lua
@@ -1,6 +1,7 @@
 local Generic = require("device/generic/device")
 local isAndroid, android = pcall(require, "android")
 local ffi = require("ffi")
+local DEBUG = require("dbg")
 
 local function yes() return true end
 
@@ -18,8 +19,13 @@ function Device:init()
         device = self,
         event_map = require("device/android/event_map"),
         handleMiscEv = function(self, ev)
+            DEBUG("Android application event", ev.code)
             if ev.code == ffi.C.APP_CMD_SAVE_STATE then
                 return "SaveState"
+            elseif ev.code == ffi.C.APP_CMD_GAINED_FOCUS then
+                self.device.screen:refreshFull()
+            elseif ev.code == ffi.C.APP_CMD_WINDOW_REDRAW_NEEDED then
+                self.device.screen:refreshFull()
             end
         end,
     }
diff --git a/frontend/device/input.lua b/frontend/device/input.lua
index 35c35d36a..aaae4c135 100644
--- a/frontend/device/input.lua
+++ b/frontend/device/input.lua
@@ -120,8 +120,6 @@ function Input:init()
         screen = self.device.screen,
         input = self,
     }
-    -- allow access to device object in FFI API
-    input.device = self.device
 
     -- set up fake event map
     self.event_map[10000] = "IntoSS" -- go into screen saver