diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 6ba30a2..907263e 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="TestApp">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-07-23T14:30:02.857797708Z">
+        <DropdownSelection timestamp="2024-07-23T15:11:36.844182977Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=981f7af2" />
diff --git a/test-app/src/main/java/net/newpipe/newplayer/testapp/MainActivity.kt b/test-app/src/main/java/net/newpipe/newplayer/testapp/MainActivity.kt
index cb32dd1..bc15418 100644
--- a/test-app/src/main/java/net/newpipe/newplayer/testapp/MainActivity.kt
+++ b/test-app/src/main/java/net/newpipe/newplayer/testapp/MainActivity.kt
@@ -22,6 +22,7 @@ package net.newpipe.newplayer.testapp
 
 import android.os.Bundle
 import android.view.View
+import android.webkit.RenderProcessGoneDetail
 import android.widget.Button
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
@@ -54,13 +55,15 @@ class MainActivity : AppCompatActivity() {
         val video_view = findViewById<VideoPlayerView>(R.id.new_player_video_view)
         val start_stream_button = findViewById<Button>(R.id.start_stream_button)
         val buttons_layout = findViewById<View>(R.id.buttons_layout)
+        val embedded_player_layout = findViewById<View>(R.id.player_column)
+        val fullscreen_player = findViewById<VideoPlayerView>(R.id.fullscreen_player)
 
         start_stream_button.setOnClickListener {
             newPlayer.playWhenReady = true
-            newPlayer.setStream(getString(R.string.ccc_chromebooks_video))
+            newPlayer.setStream(getString(R.string.ccc_6502_video))
         }
 
-        video_view.viewModel = videoPlayerViewModel
+
         videoPlayerViewModel.newPlayer = newPlayer
 
         videoPlayerViewModel.maxContentRatio = 4F/3F
@@ -72,25 +75,20 @@ class MainActivity : AppCompatActivity() {
             WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
 
 
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
-            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-            v.setPadding(
-                systemBars.left,
-                systemBars.top,
-                systemBars.right,
-                systemBars.bottom
-            )
-            insets
-        }
-
-        if (videoPlayerViewModel.uiState.value.fullscreen) {
+        val setupFullscreen = {
             //ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
             //    v.setPadding(0, 0, 0, 0)
             //    insets
             //}
             buttons_layout.visibility = View.GONE
+            embedded_player_layout.visibility = View.GONE
+            fullscreen_player.visibility = View.VISIBLE
+            fullscreen_player.viewModel = videoPlayerViewModel
+
             //windowInsetsController.hide(WindowInsetsCompat.Type.systemBars())
-        } else {
+        }
+
+        val setupEmbeddedView = {
             buttons_layout.visibility = View.VISIBLE
 
             ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
@@ -104,11 +102,28 @@ class MainActivity : AppCompatActivity() {
                 insets
             }
 
+            buttons_layout.visibility = View.VISIBLE
+            embedded_player_layout.visibility = View.VISIBLE
+            fullscreen_player.visibility = View.GONE
+            video_view.viewModel = videoPlayerViewModel
+
+
             //windowInsetsController.show(WindowInsetsCompat.Type.systemBars())
         }
 
+        if (videoPlayerViewModel.uiState.value.fullscreen) {
+            setupFullscreen()
+        } else {
+            setupEmbeddedView()
+        }
+
         videoPlayerViewModel.callbackListener = object : VideoPlayerViewModel.Listener {
-            override fun onFullscreenToggle(isFullscreen: Boolean) {}
+            override fun onFullscreenToggle(isFullscreen: Boolean) {
+                if (isFullscreen)
+                    setupFullscreen()
+                else
+                    setupEmbeddedView()
+            }
 
             override fun onUiVissibleToggle(isVissible: Boolean) {
                 if (isVissible) {
@@ -118,6 +133,5 @@ class MainActivity : AppCompatActivity() {
                 }
             }
         }
-
     }
 }
\ No newline at end of file
diff --git a/test-app/src/main/res/layout-land/activity_main.xml b/test-app/src/main/res/layout-land/activity_main.xml
index 3452ed6..a3d7e28 100644
--- a/test-app/src/main/res/layout-land/activity_main.xml
+++ b/test-app/src/main/res/layout-land/activity_main.xml
@@ -27,6 +27,17 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <net.newpipe.newplayer.VideoPlayerView
+        android:id="@+id/fullscreen_player"
+        android:name="net.newpipe.newplayer.VideoPlayerFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:minHeight="50dp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <LinearLayout
         android:id="@+id/player_column"
diff --git a/test-app/src/main/res/layout/activity_main.xml b/test-app/src/main/res/layout/activity_main.xml
index 4f2d57b..900a1dd 100644
--- a/test-app/src/main/res/layout/activity_main.xml
+++ b/test-app/src/main/res/layout/activity_main.xml
@@ -26,6 +26,17 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <net.newpipe.newplayer.VideoPlayerView
+        android:id="@+id/fullscreen_player"
+        android:name="net.newpipe.newplayer.VideoPlayerFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:minHeight="50dp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <FrameLayout
         android:id="@+id/player_column"