diff --git a/app/docker/views/containers/create/createContainerController.js b/app/docker/views/containers/create/createContainerController.js
index 38e043be1..ac241ff90 100644
--- a/app/docker/views/containers/create/createContainerController.js
+++ b/app/docker/views/containers/create/createContainerController.js
@@ -89,6 +89,7 @@ angular.module('portainer.docker').controller('CreateContainerController', [
       CpuLimit: 0,
       MemoryLimit: 0,
       MemoryReservation: 0,
+      ShmSize: 64,
       CmdMode: 'default',
       EntrypointMode: 'default',
       Env: [],
@@ -414,6 +415,13 @@ angular.module('portainer.docker').controller('CreateContainerController', [
     }
 
     function prepareResources(config) {
+      // Shared Memory Size - Round to 0.125
+      if ($scope.formValues.ShmSize >= 0) {
+        var shmSize = (Math.round($scope.formValues.ShmSize * 8) / 8).toFixed(3);
+        shmSize *= 1024 * 1024;
+        config.HostConfig.ShmSize = shmSize;
+      }
+
       // Memory Limit - Round to 0.125
       if ($scope.formValues.MemoryLimit >= 0) {
         var memoryLimit = (Math.round($scope.formValues.MemoryLimit * 8) / 8).toFixed(3);
@@ -695,6 +703,9 @@ angular.module('portainer.docker').controller('CreateContainerController', [
       if (d.HostConfig.MemoryReservation) {
         $scope.formValues.MemoryReservation = d.HostConfig.MemoryReservation / 1024 / 1024;
       }
+      if (d.HostConfig.ShmSize) {
+        $scope.formValues.ShmSize = d.HostConfig.ShmSize / 1024 / 1024;
+      }
     }
 
     function loadFromContainerCapabilities(d) {
diff --git a/app/docker/views/containers/create/createcontainer.html b/app/docker/views/containers/create/createcontainer.html
index 4ca53836a..5205323e5 100644
--- a/app/docker/views/containers/create/createcontainer.html
+++ b/app/docker/views/containers/create/createcontainer.html
@@ -695,6 +695,17 @@
                 <!-- !sysctls-input-list -->
               </div>
               <!-- !sysctls -->
+              <!-- shm-size-input -->
+              <div class="form-group">
+                <label for="shm-size" class="col-sm-2 control-label text-left"> Shared memory size </label>
+                <div class="col-sm-2">
+                  <input type="number" min="1" class="form-control" ng-model="formValues.ShmSize" id="shm-size" />
+                </div>
+                <div class="col-sm-2">
+                  <p class="small text-muted mt-2"> Size of /dev/shm (<b>MB</b>) </p>
+                </div>
+              </div>
+              <!-- !shm-size-input -->
               <!-- #region GPU -->
               <div class="col-sm-12 form-section-title"> GPU </div>