diff --git a/src/tui/tcell.go b/src/tui/tcell.go
index 5f70f54a..0009b912 100644
--- a/src/tui/tcell.go
+++ b/src/tui/tcell.go
@@ -560,7 +560,7 @@ func (r *FullscreenRenderer) GetChar() Event {
 
 func (r *FullscreenRenderer) Pause(clear bool) {
 	if clear {
-		_screen.Fini()
+		r.Close()
 	}
 }
 
@@ -572,6 +572,7 @@ func (r *FullscreenRenderer) Resume(clear bool, sigcont bool) {
 
 func (r *FullscreenRenderer) Close() {
 	_screen.Fini()
+	_screen = nil
 }
 
 func (r *FullscreenRenderer) RefreshWindows(windows []Window) {
diff --git a/test/test_layout.rb b/test/test_layout.rb
index 0e4db204..ee0f31d2 100644
--- a/test/test_layout.rb
+++ b/test/test_layout.rb
@@ -338,7 +338,7 @@ class TestLayout < TestInteractive
   end
 
   def test_gap
-    tmux.send_keys %(seq 100 | #{FZF} --gap --border --reverse), :Enter
+    tmux.send_keys %(seq 100 | #{FZF} --gap --border rounded --reverse), :Enter
     block = <<~BLOCK
       ╭─────────────────
       │ >
@@ -355,7 +355,7 @@ class TestLayout < TestInteractive
   end
 
   def test_gap_2
-    tmux.send_keys %(seq 100 | #{FZF} --gap=2 --gap-line xyz --border --reverse), :Enter
+    tmux.send_keys %(seq 100 | #{FZF} --gap=2 --gap-line xyz --border rounded --reverse), :Enter
     block = <<~BLOCK
       ╭─────────────────
       │ >
@@ -799,7 +799,7 @@ class TestLayout < TestInteractive
   end
 
   def test_style_full_adaptive_height
-    tmux.send_keys %(seq 1| #{FZF} --style=full --height=~100% --header-lines=1 --info=default), :Enter
+    tmux.send_keys %(seq 1| #{FZF} --style=full:rounded --height=~100% --header-lines=1 --info=default), :Enter
     block = <<~BLOCK
       ╭────────
       ╰────────
diff --git a/test/test_preview.rb b/test/test_preview.rb
index d4faffa5..ee1a5672 100644
--- a/test/test_preview.rb
+++ b/test/test_preview.rb
@@ -524,7 +524,7 @@ class TestPreview < TestInteractive
   end
 
   def test_alternative_preview_window_opts
-    tmux.send_keys "seq 10 | #{FZF} --preview-window '~5,2,+0,<100000(~0,+100,wrap,noinfo)' --preview 'seq 1000'", :Enter
+    tmux.send_keys "seq 10 | #{FZF} --preview-border rounded --preview-window '~5,2,+0,<100000(~0,+100,wrap,noinfo)' --preview 'seq 1000'", :Enter
     tmux.until { |lines| assert_equal 10, lines.match_count }
     tmux.until do |lines|
       assert_equal ['╭────╮', '│ 10 │', '│ 0  │', '│ 10 │', '│ 1  │'], lines.take(5).map(&:strip)