diff --git a/plugins/channelrx/demoddatv/datvdemodgui.cpp b/plugins/channelrx/demoddatv/datvdemodgui.cpp
index e0a6bf671..403c07900 100644
--- a/plugins/channelrx/demoddatv/datvdemodgui.cpp
+++ b/plugins/channelrx/demoddatv/datvdemodgui.cpp
@@ -164,6 +164,8 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba
     connect(&m_objTimer, SIGNAL(timeout()), this, SLOT(tick()));
     m_objTimer.start();
 
+    //ui->fullScreen->setVisible(false);
+
     ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03)));
     ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
     ui->deltaFrequency->setValueRange(false, 7, -9999999, 9999999);
diff --git a/plugins/channelrx/demoddatv/datvdemodgui.ui b/plugins/channelrx/demoddatv/datvdemodgui.ui
index 663bc2565..e5f22af04 100644
--- a/plugins/channelrx/demoddatv/datvdemodgui.ui
+++ b/plugins/channelrx/demoddatv/datvdemodgui.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>530</width>
-    <height>442</height>
+    <height>443</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -204,7 +204,7 @@
     <enum>QTabWidget::West</enum>
    </property>
    <property name="currentIndex">
-    <number>0</number>
+    <number>1</number>
    </property>
    <widget class="QWidget" name="datvTab">
     <attribute name="title">
@@ -775,46 +775,6 @@
        <string>Full Screen</string>
       </property>
      </widget>
-     <widget class="QWidget" name="formLayoutWidget">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>20</y>
-        <width>488</width>
-        <height>272</height>
-       </rect>
-      </property>
-      <layout class="QFormLayout" name="formLayout">
-       <item row="0" column="0">
-        <widget class="DATVideoRender" name="screenTV_2" native="true">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>480</width>
-           <height>270</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>355</width>
-           <height>270</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>Video</string>
-         </property>
-         <property name="styleSheet">
-          <string notr="true"/>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
      <widget class="QCheckBox" name="chkTS">
       <property name="enabled">
        <bool>false</bool>
@@ -998,6 +958,16 @@
        <bool>true</bool>
       </property>
      </widget>
+     <widget class="DATVideoRender" name="screenTV_2" native="true">
+      <property name="geometry">
+       <rect>
+        <x>2</x>
+        <y>22</y>
+        <width>492</width>
+        <height>270</height>
+       </rect>
+      </property>
+     </widget>
     </widget>
    </widget>
   </widget>
diff --git a/plugins/channelrx/demoddatv/datvideorender.cpp b/plugins/channelrx/demoddatv/datvideorender.cpp
index 4cbea4253..a117f824d 100644
--- a/plugins/channelrx/demoddatv/datvideorender.cpp
+++ b/plugins/channelrx/demoddatv/datvideorender.cpp
@@ -18,6 +18,8 @@
 #include <math.h>
 #include <algorithm>
 
+#include <QGroupBox>
+
 extern "C"
 {
 #include <libswresample/swresample.h>
@@ -26,7 +28,7 @@ extern "C"
 #include "audio/audiofifo.h"
 #include "datvideorender.h"
 
-DATVideoRender::DATVideoRender(QWidget *parent) : TVScreen(true, parent)
+DATVideoRender::DATVideoRender(QWidget *parent) : TVScreen(true, parent), m_parentWidget(parent)
 {
     installEventFilter(this);
     m_isFullScreen = false;
@@ -94,14 +96,25 @@ void DATVideoRender::SetFullScreen(bool fullScreen)
 
     if (fullScreen == true)
     {
-        setWindowFlags(Qt::Window);
-        showFullScreen();
+        m_originalWindowFlags = this->windowFlags();
+        m_originalSize = this->size();
+        this->setParent(0);
+        this->setWindowFlags( Qt::FramelessWindowHint|Qt::WindowStaysOnTopHint);
+        this->showMaximized();
+        // setWindowFlags(Qt::Window);
+        // setWindowState(Qt::WindowFullScreen);
+        // show();
         m_isFullScreen = true;
     }
     else
     {
-        setWindowFlags(Qt::Widget);
-        showNormal();
+        this->setParent(m_parentWidget);
+        this->resize(m_originalSize);
+        this->overrideWindowFlags(m_originalWindowFlags);
+        this->show();
+        // setWindowFlags(Qt::Widget);
+        // setWindowState(Qt::WindowNoState);
+        // show();
         m_isFullScreen = false;
     }
 }
diff --git a/plugins/channelrx/demoddatv/datvideorender.h b/plugins/channelrx/demoddatv/datvideorender.h
index c0e415f97..6e1739112 100644
--- a/plugins/channelrx/demoddatv/datvideorender.h
+++ b/plugins/channelrx/demoddatv/datvideorender.h
@@ -109,6 +109,10 @@ class DATVideoRender : public TVScreen
     struct DataTSMetaData2 MetaData;
 
   private:
+    QWidget *m_parentWidget;
+    Qt::WindowFlags m_originalWindowFlags;
+    QSize m_originalSize;
+
     bool m_running;
     bool m_isFullScreen;