diff --git a/frameplaybackwindow.cpp b/frameplaybackwindow.cpp
index c3c34ff..ba9f1c6 100644
--- a/frameplaybackwindow.cpp
+++ b/frameplaybackwindow.cpp
@@ -23,6 +23,12 @@ FramePlaybackWindow::FramePlaybackWindow(const QVector<CANFrame> *frames, Serial
 {
     ui->setupUi(this);
 
+    ui->comboCANBus->addItem(tr("None"));
+    ui->comboCANBus->addItem(tr("0"));
+    ui->comboCANBus->addItem(tr("1"));
+    ui->comboCANBus->addItem(tr("Both"));
+    ui->comboCANBus->addItem(tr("From File"));
+
     readSettings();
 
     modelFrames = frames;
@@ -37,12 +43,6 @@ FramePlaybackWindow::FramePlaybackWindow(const QVector<CANFrame> *frames, Serial
     currentSeqItem = NULL;
     currentSeqNum = -1;
 
-    ui->comboCANBus->addItem(tr("None"));
-    ui->comboCANBus->addItem(tr("0"));
-    ui->comboCANBus->addItem(tr("1"));
-    ui->comboCANBus->addItem(tr("Both"));
-    ui->comboCANBus->addItem(tr("From File"));
-
     updateFrameLabel();
 
     connect(ui->btnStepBack, SIGNAL(clicked(bool)), this, SLOT(btnBackOneClick()));
@@ -102,6 +102,7 @@ void FramePlaybackWindow::readSettings()
         ui->cbLoop->setChecked(true);
     }
     ui->spinPlaySpeed->setValue(settings.value("Playback/DefSpeed", 5).toInt());
+    ui->comboCANBus->setCurrentIndex(settings.value("Playback/SendingBus", 4).toInt());
 }
 
 void FramePlaybackWindow::writeSettings()
diff --git a/mainsettingsdialog.cpp b/mainsettingsdialog.cpp
index a8c960a..760a9f0 100644
--- a/mainsettingsdialog.cpp
+++ b/mainsettingsdialog.cpp
@@ -7,6 +7,12 @@ MainSettingsDialog::MainSettingsDialog(QWidget *parent) :
 {
     ui->setupUi(this);
 
+    ui->comboSendingBus->addItem(tr("None"));
+    ui->comboSendingBus->addItem(tr("0"));
+    ui->comboSendingBus->addItem(tr("1"));
+    ui->comboSendingBus->addItem(tr("Both"));
+    ui->comboSendingBus->addItem(tr("From File"));
+
     settings = new QSettings();
 
     //update the GUI with all the settings we have stored giving things
@@ -21,6 +27,7 @@ MainSettingsDialog::MainSettingsDialog(QWidget *parent) :
     ui->cbValidate->setChecked(settings->value("Main/ValidateComm", true).toBool());
     ui->spinPlaybackSpeed->setValue(settings->value("Playback/DefSpeed", 5).toInt());
     ui->cbTimeSeconds->setChecked(settings->value("Main/TimeSeconds", false).toBool());
+    ui->comboSendingBus->setCurrentIndex(settings->value("Playback/SendingBus", 4).toInt());
 
     //just for simplicity they all call the same function and that function updates all settings at once
     connect(ui->cbDisplayHex, SIGNAL(toggled(bool)), this, SLOT(updateSettings()));
@@ -33,6 +40,7 @@ MainSettingsDialog::MainSettingsDialog(QWidget *parent) :
     connect(ui->cbValidate, SIGNAL(toggled(bool)), this, SLOT(updateSettings()));
     connect(ui->spinPlaybackSpeed, SIGNAL(valueChanged(int)), this, SLOT(updateSettings()));
     connect(ui->cbTimeSeconds, SIGNAL(toggled(bool)), this, SLOT(updateSettings()));
+    connect(ui->comboSendingBus, SIGNAL(currentIndexChanged(int)), this, SLOT(updateSettings()));
 }
 
 MainSettingsDialog::~MainSettingsDialog()
@@ -58,6 +66,7 @@ void MainSettingsDialog::updateSettings()
     settings->setValue("Main/ValidateComm", ui->cbValidate->isChecked());
     settings->setValue("Playback/DefSpeed", ui->spinPlaybackSpeed->value());
     settings->setValue("Main/TimeSeconds", ui->cbTimeSeconds->isChecked());
+    settings->setValue("Playback/SendingBus", ui->comboSendingBus->currentIndex());
 
     settings->sync();
 }
diff --git a/mainsettingsdialog.ui b/mainsettingsdialog.ui
index 6ac5dfb..79914d6 100644
--- a/mainsettingsdialog.ui
+++ b/mainsettingsdialog.ui
@@ -121,6 +121,20 @@
         </item>
        </layout>
       </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QLabel" name="label_2">
+          <property name="text">
+           <string>Default Sending Bus</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="comboSendingBus"/>
+        </item>
+       </layout>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 76d2edd..8cbc255 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -306,7 +306,7 @@ void MainWindow::updateFilterList()
             else thisItem->setText(QString::number(filterIter.key()));
         thisItem->setFlags(thisItem->flags() | Qt::ItemIsUserCheckable);
         if (filterIter.value()) thisItem->setCheckState(Qt::Checked);
-        else thisItem->setCheckState(Qt::Unchecked);
+            else thisItem->setCheckState(Qt::Unchecked);
         ui->listFilters->addItem(thisItem);
     }
 }