diff --git a/src/game/mario_actions_automatic.c b/src/game/mario_actions_automatic.c
index 7ec01064..b248d7f8 100644
--- a/src/game/mario_actions_automatic.c
+++ b/src/game/mario_actions_automatic.c
@@ -941,7 +941,8 @@ s32 act_bubbled(struct MarioState* m) {
         m->vel[1] = 0;
         m->vel[2] = 0;
         m->marioObj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE;
-        return set_mario_action(m, ACT_IDLE, 0);
+        u8 underWater = (m->pos[1] < ((f32)m->waterLevel));
+        return set_mario_action(m, underWater ? ACT_WATER_IDLE : ACT_IDLE, 0);
     }
 
     return FALSE;