diff --git a/src/DisplaysView.cpp b/src/DisplaysView.cpp
index f0f6b3f..9e03529 100644
--- a/src/DisplaysView.cpp
+++ b/src/DisplaysView.cpp
@@ -764,13 +764,13 @@ void DisplaysView::draw()
             glm::ivec4 rect (0, 0, 800, 600);
             rect.p = Mixer::manager().session()->frame()->width();
             rect.q = Mixer::manager().session()->frame()->height();
-            Rendering::manager().outputWindow(current_window_).setDecoration(true);
             Settings::application.windows[1+current_window_].show_pattern = false;
             Settings::application.windows[1+current_window_].custom = false;
             if (Settings::application.windows[current_window_+1].fullscreen)
                 Rendering::manager().outputWindow(current_window_).exitFullscreen();
             else
                 Rendering::manager().outputWindow(current_window_).setCoordinates( rect );
+            Rendering::manager().outputWindow(current_window_).setDecoration(true);
             windows_[current_window_].need_update_ += 2;
         }
         if ( ImGui::MenuItem( ICON_FA_TEMPERATURE_LOW "   Reset white balance") ) {
diff --git a/src/SourceControlWindow.cpp b/src/SourceControlWindow.cpp
index 76bf1a0..2826299 100644
--- a/src/SourceControlWindow.cpp
+++ b/src/SourceControlWindow.cpp
@@ -63,10 +63,10 @@ SourceControlWindow::SourceControlWindow() : WorkspaceWindow("SourceController")
     captureFolderDialog = new DialogToolkit::OpenFolderDialog("Capture frame Location");
 
     // initialize checkerboard background texture
-    checker_background_->open("videotestsrc pattern=checkers-8 ! "
+    checker_background_->open("videotestsrc name=bgchecker pattern=checkers-8 ! "
                               "videobalance saturation=0 contrast=1",
                               CHECKER_RESOLUTION, CHECKER_RESOLUTION);
-    checker_background_->play(true);
+    checker_background_->play(false);
     while (checker_background_->texture() == Resource::getTextureBlack())
         checker_background_->update();
 }