diff --git a/NEWS b/NEWS
index e66eddd3..00398e3c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 ncmpcpp-0.7.1 (????-??-??)
 * Selected songs in media library can now be added to playlists.
+* Confirmation before shuffling a playlist can now be disabled.
 
 ncmpcpp-0.7 (2015-11-22)
 * Playlist sorting dialog now contains 'Album artist' option.
diff --git a/src/actions.cpp b/src/actions.cpp
index 84cce0e9..d63215c2 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -1215,7 +1215,8 @@ bool Shuffle::canBeRun()
 
 void Shuffle::run()
 {
-	confirmAction("Do you really want to shuffle selected range?");
+	if (Config.ask_before_shuffling_playlists)
+		confirmAction("Do you really want to shuffle selected range?");
 	auto begin = myPlaylist->main().begin();
 	Mpd.ShuffleRange(m_begin-begin, m_end-begin);
 	Statusbar::print("Range shuffled");
diff --git a/src/settings.cpp b/src/settings.cpp
index d6fcc494..6f3daf52 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -566,6 +566,9 @@ bool Configuration::read(const std::vector<std::string> &config_paths, bool igno
 	p.add("ask_before_clearing_playlists", yes_no(
 		ask_before_clearing_playlists, true
 	));
+	p.add("ask_before_shuffling_playlists", yes_no(
+		ask_before_shuffling_playlists, true
+	));
 	p.add("clock_display_seconds", yes_no(
 		clock_display_seconds, false
 	));
diff --git a/src/settings.h b/src/settings.h
index d97711d6..5b244298 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -152,6 +152,7 @@ struct Configuration
 	bool use_console_editor;
 	bool use_cyclic_scrolling;
 	bool ask_before_clearing_playlists;
+	bool ask_before_shuffling_playlists;
 	bool mouse_support;
 	bool mouse_list_scroll_whole_page;
 	bool visualizer_in_stereo;