diff --git a/connections/connectionwindow.cpp b/connections/connectionwindow.cpp
index b1512ba..5ce5407 100644
--- a/connections/connectionwindow.cpp
+++ b/connections/connectionwindow.cpp
@@ -8,6 +8,7 @@
 #include "connections/canconfactory.h"
 #include "connections/canconmanager.h"
 #include "canbus.h"
+#include <QSettings>
 
 ConnectionWindow::ConnectionWindow(QWidget *parent) :
     QDialog(parent),
@@ -41,8 +42,11 @@ ConnectionWindow::ConnectionWindow(QWidget *parent) :
     ui->btnSendText->setEnabled(false);
     ui->lineSend->setEnabled(false);
 
-    /* load connection configuration */
-    loadConnections();
+    if (settings.value("Main/SaveRestoreConnections", false).toBool())
+    {
+        /* load connection configuration */
+        loadConnections();
+    }
 
     ui->rbSocketCAN->setEnabled(isSerialBusAvailable());
 
diff --git a/mainsettingsdialog.cpp b/mainsettingsdialog.cpp
index 2dd0a38..1a503d5 100644
--- a/mainsettingsdialog.cpp
+++ b/mainsettingsdialog.cpp
@@ -31,6 +31,7 @@ MainSettingsDialog::MainSettingsDialog(QWidget *parent) :
     ui->lineRemoteHost->setText(settings->value("Remote/Host", "api.savvycan.com").toString());
     ui->lineRemotePort->setText(settings->value("Remote/Port", "21315").toString()); // = 0x5343 = SC. Yep, really creative port number
     ui->cbAutoStartRemote->setChecked(settings->value("Remote/AutoStart", false).toBool());
+    ui->cbLoadConnections->setChecked(settings->value("Main/SaveRestoreConnections", false).toBool());
 
     ui->spinFontSize->setValue(settings->value("Main/FontSize", ui->cbDisplayHex->font().pointSize()).toUInt());
 
@@ -82,6 +83,7 @@ MainSettingsDialog::MainSettingsDialog(QWidget *parent) :
     connect(ui->cbAutoStartRemote, SIGNAL(toggled(bool)), this, SLOT(updateSettings()));
     connect(ui->lineRemoteHost, SIGNAL(editingFinished()), this, SLOT(updateSettings()));
     connect(ui->lineRemotePort, SIGNAL(editingFinished()), this, SLOT(updateSettings()));
+    connect(ui->cbLoadConnections, SIGNAL(toggled(bool)), this, SLOT(updateSettings()));
     installEventFilter(this);
 }
 
@@ -127,6 +129,7 @@ void MainSettingsDialog::updateSettings()
     settings->setValue("Main/AutoScroll", ui->cbMainAutoScroll->isChecked());
     settings->setValue("Playback/AutoLoop", ui->cbPlaybackLoop->isChecked());
     settings->setValue("Main/SaveRestorePositions", ui->cbRestorePositions->isChecked());
+    settings->setValue("Main/SaveRestoreConnections", ui->cbLoadConnections->isChecked());
     settings->setValue("Main/ValidateComm", ui->cbValidate->isChecked());
     settings->setValue("Playback/DefSpeed", ui->spinPlaybackSpeed->value());
     settings->setValue("Main/TimeSeconds", ui->rbSeconds->isChecked());
diff --git a/ui/mainsettingsdialog.ui b/ui/mainsettingsdialog.ui
index 1b790dd..05de6aa 100644
--- a/ui/mainsettingsdialog.ui
+++ b/ui/mainsettingsdialog.ui
@@ -45,6 +45,13 @@
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QCheckBox" name="cbLoadConnections">
+          <property name="text">
+           <string>Save/Restore CAN bus connections</string>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QCheckBox" name="cbDisplayHex">
           <property name="text">
@@ -337,20 +344,27 @@
   </layout>
  </widget>
  <tabstops>
+  <tabstop>cbMainAutoScroll</tabstop>
   <tabstop>cbRestorePositions</tabstop>
+  <tabstop>cbLoadConnections</tabstop>
   <tabstop>cbDisplayHex</tabstop>
   <tabstop>cbValidate</tabstop>
+  <tabstop>cbUseFiltered</tabstop>
+  <tabstop>cbUseOpenGL</tabstop>
   <tabstop>rbSeconds</tabstop>
   <tabstop>rbMicros</tabstop>
   <tabstop>rbSysClock</tabstop>
   <tabstop>lineClockFormat</tabstop>
-  <tabstop>cbMainAutoScroll</tabstop>
+  <tabstop>spinFontSize</tabstop>
   <tabstop>cbFlowUseTimestamp</tabstop>
   <tabstop>cbFlowAutoRef</tabstop>
   <tabstop>cbPlaybackLoop</tabstop>
   <tabstop>spinPlaybackSpeed</tabstop>
   <tabstop>comboSendingBus</tabstop>
   <tabstop>cbInfoAutoExpand</tabstop>
+  <tabstop>lineRemoteHost</tabstop>
+  <tabstop>lineRemotePort</tabstop>
+  <tabstop>cbAutoStartRemote</tabstop>
  </tabstops>
  <resources/>
  <connections/>