diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 4fb35fe15..252a85bf7 100755
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -14,6 +14,7 @@
 
 **Bugs**
 - **Modal** - Using multiple modals with different `inverted` `blurring` or `closable` settings will no longer in some cases inherit the options of other modals #4368
+- **Dimmer** - Changing closable or inverted settings dynamically with `setting` will now modify settings correctly on next show/hide without re-initialization
 - **Modal** - Fixed issue where modal `refresh` was being called on modals even if they are hidden. #5319 **Thanks @p2kmgcl**
 - **Dropdown** - Fixed issue where using `down` key to re-open dropdown when using `search selection dropdown` would start at the top element instead of jumping to selected element
 - **Dropdown** - Fix dropdown arrow being slightly off center due to em calculation being incorrect due to differences in relative em
diff --git a/src/definitions/modules/dimmer.js b/src/definitions/modules/dimmer.js
index 3e317d004..2feb915ec 100755
--- a/src/definitions/modules/dimmer.js
+++ b/src/definitions/modules/dimmer.js
@@ -130,10 +130,12 @@ $.fn.dimmer = function(parameters) {
               module.set.pageDimmer();
             }
 
-            $dimmable
-              .on(clickEvent + eventNamespace, selector.dimmer, module.event.click)
-            ;
-
+            if( module.is.closable() ) {
+              module.verbose('Adding dimmer close event', $dimmer);
+              $dimmable
+                .on(clickEvent + eventNamespace, selector.dimmer, module.event.click)
+              ;
+            }
           }
         },
 
@@ -151,7 +153,7 @@ $.fn.dimmer = function(parameters) {
         event: {
           click: function(event) {
             module.verbose('Determining if event occured on dimmer', event);
-            if( ($dimmer.find(event.target).length === 0 || $(event.target).is(selector.content)) && module.is.closable()) {
+            if( $dimmer.find(event.target).length === 0 || $(event.target).is(selector.content) ) {
               module.hide();
               event.stopImmediatePropagation();
             }
@@ -189,7 +191,6 @@ $.fn.dimmer = function(parameters) {
           ;
           module.debug('Showing dimmer', $dimmer, settings);
           if( (!module.is.dimmed() || module.is.animating()) && module.is.enabled() ) {
-            module.set.variation();
             module.animate.show(callback);
             settings.onShow.call(element);
             settings.onChange.call(element);
diff --git a/src/definitions/modules/modal.js b/src/definitions/modules/modal.js
index e0cdfd630..1db5f4ab6 100755
--- a/src/definitions/modules/modal.js
+++ b/src/definitions/modules/modal.js
@@ -105,12 +105,19 @@ $.fn.modal = function(parameters) {
 
         create: {
           dimmer: function() {
+            var
+              defaultSettings = {
+                debug      : settings.debug,
+                dimmerName : 'modals'
+              },
+              dimmerSettings = $.extend(true, defaultSettings, settings.dimmerSettings)
+            ;
             if($.fn.dimmer === undefined) {
               module.error(error.dimmer);
               return;
             }
             module.debug('Creating dimmer');
-            $dimmable = $context.dimmer({});
+            $dimmable = $context.dimmer(dimmerSettings);
             if(settings.detachable) {
               module.verbose('Modal is detachable, moving content into dimmer');
               $dimmable.dimmer('add content', $module);