diff --git a/functions.php b/functions.php
index 1e7fed9..7763d80 100644
--- a/functions.php
+++ b/functions.php
@@ -235,12 +235,9 @@ function comicpress_sidebars_disabled() {
 }
 
 global $content_width;
-if ( ! isset( $content_width ) ) {
-	if (comicpress_sidebars_disabled()) { 
-		$content_width = 720; 
-	} else {
-		$content_width = 520;
-	}
+if (!isset($content_width)) {
+	$content_width = comicpress_themeinfo('content_width');
+	if (!$content_width) $content_width = 500;
 }
 
 if (!function_exists('comicpress_display_social_icons')) {
@@ -373,7 +370,8 @@ function comicpress_load_options() {
 			'menubar_social_deviantart' => '',
 			'menubar_social_myspace' => '',
 			'menubar_social_email' => '',
-			'enable_jetpack_infinite_scrolling' => false
+			'enable_jetpack_infinite_scrolling' => false,
+			'content_width' => 500
 		) as $field => $value) {
 			$comicpress_options[$field] = $value;
 		}
diff --git a/options.php b/options.php
index 151693f..1af1699 100644
--- a/options.php
+++ b/options.php
@@ -173,7 +173,8 @@ function comicpress_admin_options() { ?>
 				'custom_image_header_width',
 				'custom_image_header_height',
 				'archive_display_order',
-				'excerpt_or_content_in_archive'
+				'excerpt_or_content_in_archive',
+				'content_width'
 						) as $key) {
 							if (isset($_REQUEST[$key])) 
 								$comicpress_options[$key] = wp_filter_nohtml_kses($_REQUEST[$key]);
diff --git a/options/general.php b/options/general.php
index 9e488a4..5e757f7 100644
--- a/options/general.php
+++ b/options/general.php
@@ -49,6 +49,24 @@
 					</td>
 				</tr>
 			</table>
+
+			<table class="widefat">
+				<thead>
+					<tr>
+						<th colspan="3"><?php _e('Content Width','comicpress'); ?></th>
+					</tr>
+				</thead>
+				<tr>
+					<?php if (!isset($comicpress_options['content_width'])) $comicpress_options['content_width'] = 500; ?>
+					<th scope="row"><label for="home_post_count"><?php _e('How wide do you want the media and images content to appear in posts and pages?','comicpress'); ?></label></th>
+					<td>
+						<input type="text" size="4" name="content_width" id="content_width" value="<?php echo $comicpress_options['content_width']; ?>" />
+					</td>
+					<td>
+						<?php _e('This sets a specific width for WordPress to use for media content within your posts.  Default = 500','comicpress'); ?>
+					</td>
+				</tr>
+			</table>
 			
 			<table class="widefat">
 				<thead>