diff --git a/sdrgui/gui/devicestreamselectiondialog.cpp b/sdrgui/gui/devicestreamselectiondialog.cpp
index f7d906c3e..20e97a907 100644
--- a/sdrgui/gui/devicestreamselectiondialog.cpp
+++ b/sdrgui/gui/devicestreamselectiondialog.cpp
@@ -22,10 +22,10 @@
 DeviceStreamSelectionDialog::DeviceStreamSelectionDialog(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::DeviceStreamSelectionDialog),
-    m_hasChanged(false),
-    m_streamIndex(0)
+    m_hasChanged(false)
 {
     ui->setupUi(this);
+    setStreamIndex(0);
 }
 
 DeviceStreamSelectionDialog::~DeviceStreamSelectionDialog()
diff --git a/sdrgui/gui/devicestreamselectiondialog.ui b/sdrgui/gui/devicestreamselectiondialog.ui
index 2bfff89ef..13687f005 100644
--- a/sdrgui/gui/devicestreamselectiondialog.ui
+++ b/sdrgui/gui/devicestreamselectiondialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>135</height>
+    <width>360</width>
+    <height>72</height>
    </rect>
   </property>
   <property name="font">
diff --git a/sdrgui/gui/rollupwidget.cpp b/sdrgui/gui/rollupwidget.cpp
index 4557a3fdb..e3e49fc29 100644
--- a/sdrgui/gui/rollupwidget.cpp
+++ b/sdrgui/gui/rollupwidget.cpp
@@ -119,11 +119,11 @@ int RollupWidget::arrangeRollups()
 	for(int i = 0; i < children().count(); ++i)
 	{
 		QWidget* r = qobject_cast<QWidget*>(children()[i]);
-		if(r != NULL)
+		if (r != nullptr)
 		{
 			pos += fm.height() + 2;
 
-			if(!r->isHidden() && (r->windowTitle() != "Basic channel settings"))
+			if (!r->isHidden() && (r->windowTitle() != "Basic channel settings") && (r->windowTitle() != "Select device stream"))
 			{
 				r->move(2, pos + 3);
 				int h = 0;
@@ -241,7 +241,9 @@ void RollupWidget::paintEvent(QPaintEvent*)
 
 int RollupWidget::paintRollup(QWidget* rollup, int pos, QPainter* p, bool last, const QColor& frame)
 {
-    if (rollup->windowTitle() == "Basic channel settings") return 0;
+    if ((rollup->windowTitle() == "Basic channel settings") || (rollup->windowTitle() == "Select device stream")) {
+		return 0;
+	}
 
 	QFontMetrics fm(font());
 	int height = 1;