diff --git a/src/ContainerStore.js b/src/ContainerStore.js
index 2231c3736f..89d7825969 100644
--- a/src/ContainerStore.js
+++ b/src/ContainerStore.js
@@ -119,10 +119,15 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), {
             if (containerData.State && !containerData.State.Running) {
               self.fetchContainer(containerData.name, callback);
             } else {
-              container.start({
-                PublishAllPorts: true,
+              var startopts = {
                 Binds: binds
-              }, function (err) {
+              };
+              if (containerData.NetworkSettings && containerData.NetworkSettings.Ports) {
+                startopts.PortBindings = containerData.NetworkSettings.Ports;
+              } else{
+                startopts.PublishAllPorts = true;
+              }
+              container.start(startopts, function (err) {
                 if (err) {
                   callback(err);
                   return;
diff --git a/src/SetupStore.js b/src/SetupStore.js
index 8b14bd1cc4..23629361cc 100644
--- a/src/SetupStore.js
+++ b/src/SetupStore.js
@@ -59,7 +59,7 @@ var _steps = [{
   message: 'To run Docker containers on your computer, Kitematic is starting a Linux virutal machine. This may take a minute...',
   totalPercent: 60,
   percent: 0,
-  seconds: 46,
+  seconds: 52,
   run: Promise.coroutine(function* (progressCallback) {
     setupUtil.simulateProgress(this.seconds, progressCallback);
     yield virtualBox.vmdestroy('kitematic-vm');