diff --git a/editor/reducer.js b/editor/reducer.js
index 6a8431fbe0265..6e59e9c26021c 100644
--- a/editor/reducer.js
+++ b/editor/reducer.js
@@ -15,7 +15,14 @@ import { getBlockTypes } from '@wordpress/blocks';
  */
 import { combineUndoableReducers } from './utils/undoable-reducer';
 
-const isMobile = window.innerWidth < 782;
+/**
+ * Module constants
+ */
+const DEFAULT_PREFERENCES = {
+	mode: 'visual',
+	isSidebarOpened: window.innerWidth >= 782,
+	panels: { 'post-status': true },
+};
 
 /**
  * Returns a post attribute value, flattening nested rendered content using its
@@ -426,22 +433,16 @@ export function showInsertionPoint( state = false, action ) {
 }
 
 /**
- * Reducer returning current editor mode, either "visual" or "text".
+ * Reducer returning the user preferences:
  *
- * @param  {string} state  Current state
- * @param  {Object} action Dispatched action
- * @return {string}        Updated state
+ * @param  {Object}  state                 Current state
+ * @param  {string}  state.mode            Current editor mode, either "visual" or "text".
+ * @param  {Boolean} state.isSidebarOpened Whether the sidebar is opened or closed
+ * @param  {Object}  state.panels          The state of the different sidebar panels
+ * @param  {Object}  action                Dispatched action
+ * @return {string}                        Updated state
  */
-export function mode( state = 'visual', action ) {
-	switch ( action.type ) {
-		case 'SWITCH_MODE':
-			return action.mode;
-	}
-
-	return state;
-}
-
-export function preferences( state = { isSidebarOpened: ! isMobile, panels: { 'post-status': true } }, action ) {
+export function preferences( state = DEFAULT_PREFERENCES, action ) {
 	switch ( action.type ) {
 		case 'TOGGLE_SIDEBAR':
 			return {
@@ -456,6 +457,11 @@ export function preferences( state = { isSidebarOpened: ! isMobile, panels: { 'p
 					[ action.panel ]: ! get( state, [ 'panels', action.panel ], false ),
 				},
 			};
+		case 'SWITCH_MODE':
+			return {
+				...state,
+				mode: action.mode,
+			};
 	}
 
 	return state;
@@ -530,7 +536,6 @@ export default optimist( combineReducers( {
 	blockSelection,
 	hoveredBlock,
 	showInsertionPoint,
-	mode,
 	preferences,
 	panel,
 	saving,
diff --git a/editor/selectors.js b/editor/selectors.js
index 5286bc8aa4e73..f8faf62cc27b0 100644
--- a/editor/selectors.js
+++ b/editor/selectors.js
@@ -19,7 +19,7 @@ import { addQueryArgs } from '@wordpress/url';
  * @return {String}       Editing mode
  */
 export function getEditorMode( state ) {
-	return state.mode;
+	return getPreference( state, 'mode', 'visual' );
 }
 
 /**
@@ -46,11 +46,13 @@ export function getPreferences( state ) {
  *
  * @param  {Object}  state          Global application state
  * @param  {String}  preferenceKey  Preference Key
+ * @param  {Mixed}   defaultValue   Default Value
  * @return {Mixed}                  Preference Value
  */
-export function getPreference( state, preferenceKey ) {
+export function getPreference( state, preferenceKey, defaultValue ) {
 	const preferences = getPreferences( state );
-	return preferences[ preferenceKey ];
+	const value = preferences[ preferenceKey ];
+	return value === undefined ? defaultValue : value;
 }
 
 /**
diff --git a/editor/sidebar/discussion-panel/index.js b/editor/sidebar/discussion-panel/index.js
index 96e766c1377ac..b42a76b648d07 100644
--- a/editor/sidebar/discussion-panel/index.js
+++ b/editor/sidebar/discussion-panel/index.js
@@ -20,10 +20,9 @@ import { editPost, toggleSidebarPanel } from '../../actions';
  */
 const PANEL_NAME = 'discussion-panel';
 
-function DiscussionPanel( { pingStatus = 'open', commentStatus = 'open', instanceId, isOpened, ...props } ) {
+function DiscussionPanel( { pingStatus = 'open', commentStatus = 'open', instanceId, isOpened, onTogglePanel, ...props } ) {
 	const onTogglePingback = () => props.editPost( { ping_status: pingStatus === 'open' ? 'closed' : 'open' } );
 	const onToggleComments = () => props.editPost( { comment_status: commentStatus === 'open' ? 'closed' : 'open' } );
-	const onTogglePanel = () => props.toggleSidebarPanel( PANEL_NAME );
 
 	const commentsToggleId = 'allow-comments-toggle-' + instanceId;
 	const pingbacksToggleId = 'allow-pingbacks-toggle-' + instanceId;
@@ -60,6 +59,11 @@ export default connect(
 			isOpened: isEditorSidebarPanelOpened( state, PANEL_NAME ),
 		};
 	},
-	{ editPost, toggleSidebarPanel }
+	{
+		editPost,
+		onTogglePanel() {
+			return toggleSidebarPanel( PANEL_NAME );
+		},
+	}
 )( withInstanceId( DiscussionPanel ) );
 
diff --git a/editor/sidebar/featured-image/index.js b/editor/sidebar/featured-image/index.js
index a936787bf3f46..b46b49e9662c8 100644
--- a/editor/sidebar/featured-image/index.js
+++ b/editor/sidebar/featured-image/index.js
@@ -23,11 +23,9 @@ import { editPost, toggleSidebarPanel } from '../../actions';
  */
 const PANEL_NAME = 'featured-image';
 
-function FeaturedImage( { featuredImageId, onUpdateImage, onRemoveImage, media, isOpened, ...props } ) {
-	const onToggle = () => props.toggleSidebarPanel( PANEL_NAME );
-
+function FeaturedImage( { featuredImageId, onUpdateImage, onRemoveImage, media, isOpened, onTogglePanel } ) {
 	return (
-		<PanelBody title={ __( 'Featured image' ) } opened={ isOpened } onToggle={ onToggle }>
+		<PanelBody title={ __( 'Featured image' ) } opened={ isOpened } onToggle={ onTogglePanel }>
 			<div className="editor-featured-image__content">
 				{ !! featuredImageId &&
 					<MediaUploadButton
@@ -84,7 +82,9 @@ const applyConnect = connect(
 		onRemoveImage() {
 			return editPost( { featured_media: null } );
 		},
-		toggleSidebarPanel,
+		onTogglePanel() {
+			return toggleSidebarPanel( PANEL_NAME );
+		},
 	}
 );
 
diff --git a/editor/sidebar/page-attributes/index.js b/editor/sidebar/page-attributes/index.js
index c7382d6d7d756..296fd807858d1 100644
--- a/editor/sidebar/page-attributes/index.js
+++ b/editor/sidebar/page-attributes/index.js
@@ -27,7 +27,6 @@ export class PageAttributes extends Component {
 		super( ...arguments );
 
 		this.setUpdatedOrder = this.setUpdatedOrder.bind( this );
-		this.onToggle = this.onToggle.bind( this );
 
 		this.state = {
 			supportsPageAttributes: false,
@@ -41,12 +40,8 @@ export class PageAttributes extends Component {
 		}
 	}
 
-	onToggle() {
-		this.props.toggleSidebarPanel( PANEL_NAME );
-	}
-
 	render() {
-		const { instanceId, order, postType, isOpened } = this.props;
+		const { instanceId, order, postType, isOpened, onTogglePanel } = this.props;
 		const supportsPageAttributes = get( postType.data, [
 			'supports',
 			'page-attributes',
@@ -64,7 +59,7 @@ export class PageAttributes extends Component {
 			<PanelBody
 				title={ __( 'Page Attributes' ) }
 				opened={ isOpened }
-				onToggle={ this.onToggle }
+				onToggle={ onTogglePanel }
 			>
 				<PanelRow>
 					<label htmlFor={ inputId }>
@@ -96,7 +91,9 @@ const applyConnect = connect(
 				menu_order: order,
 			} );
 		},
-		toggleSidebarPanel,
+		onTogglePanel() {
+			return toggleSidebarPanel( PANEL_NAME );
+		},
 	}
 );
 
diff --git a/editor/sidebar/post-excerpt/index.js b/editor/sidebar/post-excerpt/index.js
index d041ec924197c..1511e3b54e7d2 100644
--- a/editor/sidebar/post-excerpt/index.js
+++ b/editor/sidebar/post-excerpt/index.js
@@ -21,9 +21,8 @@ import { editPost, toggleSidebarPanel } from '../../actions';
  */
 const PANEL_NAME = 'post-excerpt';
 
-function PostExcerpt( { excerpt, onUpdateExcerpt, isOpened, ...props } ) {
+function PostExcerpt( { excerpt, onUpdateExcerpt, isOpened, onTogglePanel } ) {
 	const onChange = ( event ) => onUpdateExcerpt( event.target.value );
-	const onTogglePanel = () => props.toggleSidebarPanel( PANEL_NAME );
 
 	return (
 		<PanelBody title={ __( 'Excerpt' ) } opened={ isOpened } onToggle={ onTogglePanel }>
@@ -52,7 +51,9 @@ export default connect(
 		onUpdateExcerpt( excerpt ) {
 			return editPost( { excerpt } );
 		},
-		toggleSidebarPanel,
+		onTogglePanel() {
+			return toggleSidebarPanel( PANEL_NAME );
+		},
 	}
 )( PostExcerpt );
 
diff --git a/editor/sidebar/post-status/index.js b/editor/sidebar/post-status/index.js
index d2b3f7fd04361..cf266bf88136a 100644
--- a/editor/sidebar/post-status/index.js
+++ b/editor/sidebar/post-status/index.js
@@ -35,7 +35,6 @@ class PostStatus extends Component {
 	constructor() {
 		super( ...arguments );
 		this.togglePendingStatus = this.togglePendingStatus.bind( this );
-		this.togglePanel = this.togglePanel.bind( this );
 	}
 
 	togglePendingStatus() {
@@ -44,16 +43,12 @@ class PostStatus extends Component {
 		onUpdateStatus( updatedStatus );
 	}
 
-	togglePanel() {
-		this.props.toggleSidebarPanel( PANEL_NAME );
-	}
-
 	render() {
-		const { status, isPublished, isOpened, instanceId } = this.props;
+		const { status, isPublished, isOpened, instanceId, onTogglePanel } = this.props;
 		const pendingId = 'pending-toggle-' + instanceId;
 
 		return (
-			<PanelBody title={ __( 'Status & Visibility' ) } opened={ isOpened } onToggle={ this.togglePanel }>
+			<PanelBody title={ __( 'Status & Visibility' ) } opened={ isOpened } onToggle={ onTogglePanel }>
 				{ ! isPublished &&
 					<PanelRow>
 						<label htmlFor={ pendingId }>{ __( 'Pending review' ) }</label>
@@ -86,7 +81,9 @@ export default connect(
 		onUpdateStatus( status ) {
 			return editPost( { status } );
 		},
-		toggleSidebarPanel,
+		onTogglePanel() {
+			return toggleSidebarPanel( PANEL_NAME );
+		},
 	}
 )( withInstanceId( PostStatus ) );
 
diff --git a/editor/sidebar/post-taxonomies/index.js b/editor/sidebar/post-taxonomies/index.js
index 82a756ec7109a..a2fb94def1b99 100644
--- a/editor/sidebar/post-taxonomies/index.js
+++ b/editor/sidebar/post-taxonomies/index.js
@@ -28,8 +28,6 @@ class PostTaxonomies extends Component {
 	constructor() {
 		super( ...arguments );
 
-		this.onToggle = this.onToggle.bind( this );
-
 		this.state = {
 			taxonomies: [],
 		};
@@ -47,10 +45,6 @@ class PostTaxonomies extends Component {
 		this.fetchTaxonomies.abort();
 	}
 
-	onToggle() {
-		this.props.toggleSidebarPanel( PANEL_NAME );
-	}
-
 	render() {
 		const availableTaxonomies = this.state.taxonomies
 			.filter( ( taxonomy ) => taxonomy.types.indexOf( this.props.postType ) !== -1 );
@@ -60,7 +54,11 @@ class PostTaxonomies extends Component {
 		}
 
 		return (
-			<PanelBody title={ __( 'Categories & Tags' ) } opened={ this.props.isOpened } onToggle={ this.onToggle }>
+			<PanelBody
+				title={ __( 'Categories & Tags' ) }
+				opened={ this.props.isOpened }
+				onToggle={ this.props.onTogglePanel }
+			>
 				{ availableTaxonomies.map( ( taxonomy ) => {
 					const TaxonomyComponent = taxonomy.hierarchical ? HierarchicalTermSelector : FlatTermSelector;
 					return (
@@ -84,6 +82,10 @@ export default connect(
 			isOpened: isEditorSidebarPanelOpened( state, PANEL_NAME ),
 		};
 	},
-	{ toggleSidebarPanel }
+	{
+		onTogglePanel() {
+			return toggleSidebarPanel( PANEL_NAME );
+		},
+	}
 )( PostTaxonomies );
 
diff --git a/editor/sidebar/table-of-contents/index.js b/editor/sidebar/table-of-contents/index.js
index 17fbb4a684981..2dc54498cfd4b 100644
--- a/editor/sidebar/table-of-contents/index.js
+++ b/editor/sidebar/table-of-contents/index.js
@@ -53,9 +53,8 @@ const getHeadingLevel = heading => {
 
 const isEmptyHeading = heading => ! heading.attributes.content || heading.attributes.content.length === 0;
 
-const TableOfContents = ( { blocks, onSelect, isOpened, ...props } ) => {
+const TableOfContents = ( { blocks, onSelect, isOpened, onTogglePanel } ) => {
 	const headings = filter( blocks, ( block ) => block.name === 'core/heading' );
-	const onTogglePanel = () => props.toggleSidebarPanel( PANEL_NAME );
 
 	if ( headings.length <= 1 ) {
 		return null;
@@ -117,6 +116,8 @@ export default connect(
 		onSelect( uid ) {
 			return selectBlock( uid );
 		},
-		toggleSidebarPanel,
+		onTogglePanel() {
+			return toggleSidebarPanel( PANEL_NAME );
+		},
 	}
 )( TableOfContents );
diff --git a/editor/test/reducer.js b/editor/test/reducer.js
index 4021da7b0ad93..24c64bd0a6de3 100644
--- a/editor/test/reducer.js
+++ b/editor/test/reducer.js
@@ -19,7 +19,6 @@ import {
 	hoveredBlock,
 	isTyping,
 	blockSelection,
-	mode,
 	preferences,
 	saving,
 	notices,
@@ -784,28 +783,11 @@ describe( 'state', () => {
 		} );
 	} );
 
-	describe( 'mode()', () => {
-		it( 'should return "visual" by default', () => {
-			const state = mode( undefined, {} );
-
-			expect( state ).toBe( 'visual' );
-		} );
-
-		it( 'should return switched mode', () => {
-			const state = mode( null, {
-				type: 'SWITCH_MODE',
-				mode: 'text',
-			} );
-
-			expect( state ).toBe( 'text' );
-		} );
-	} );
-
 	describe( 'preferences()', () => {
 		it( 'should be opened by default and show the post-status panel', () => {
 			const state = preferences( undefined, {} );
 
-			expect( state ).toEqual( { isSidebarOpened: true, panels: { 'post-status': true } } );
+			expect( state ).toEqual( { mode: 'visual', isSidebarOpened: true, panels: { 'post-status': true } } );
 		} );
 
 		it( 'should toggle the sidebar open flag', () => {
@@ -833,6 +815,15 @@ describe( 'state', () => {
 
 			expect( state ).toEqual( { isSidebarOpened: false, panels: { 'post-taxonomies': false } } );
 		} );
+
+		it( 'should return switched mode', () => {
+			const state = preferences( deepFreeze( { isSidebarOpened: false } ), {
+				type: 'SWITCH_MODE',
+				mode: 'text',
+			} );
+
+			expect( state ).toEqual( { isSidebarOpened: false, mode: 'text' } );
+		} );
 	} );
 
 	describe( 'saving()', () => {
diff --git a/editor/test/selectors.js b/editor/test/selectors.js
index 71f00db6768f3..de132731348ad 100644
--- a/editor/test/selectors.js
+++ b/editor/test/selectors.js
@@ -92,7 +92,15 @@ describe( 'selectors', () => {
 	describe( 'getEditorMode', () => {
 		it( 'should return the selected editor mode', () => {
 			const state = {
-				mode: 'visual',
+				preferences: { mode: 'text' },
+			};
+
+			expect( getEditorMode( state ) ).toEqual( 'text' );
+		} );
+
+		it( 'should fallback to visual if not set', () => {
+			const state = {
+				preferences: {},
 			};
 
 			expect( getEditorMode( state ) ).toEqual( 'visual' );
@@ -115,6 +123,14 @@ describe( 'selectors', () => {
 
 			expect( getPreference( state, 'ribs' ) ).toBeUndefined();
 		} );
+
+		it( 'should return the default value if provided', () => {
+			const state = {
+				preferences: {},
+			};
+
+			expect( getPreference( state, 'ribs', 'chicken' ) ).toEqual( 'chicken' );
+		} );
 	} );
 
 	describe( 'isEditorSidebarOpened', () => {
@@ -1450,7 +1466,7 @@ describe( 'selectors', () => {
 	describe( 'getBlockInsertionPoint', () => {
 		it( 'should return the uid of the selected block', () => {
 			const state = {
-				mode: 'visual',
+				preferences: { mode: 'visual' },
 				blockSelection: {
 					start: 2,
 					end: 2,
@@ -1468,7 +1484,7 @@ describe( 'selectors', () => {
 
 		it( 'should return the last multi selected uid', () => {
 			const state = {
-				mode: 'visual',
+				preferences: { mode: 'visual' },
 				blockSelection: {
 					start: 1,
 					end: 2,
@@ -1483,7 +1499,7 @@ describe( 'selectors', () => {
 
 		it( 'should return the last block if no selection', () => {
 			const state = {
-				mode: 'visual',
+				preferences: { mode: 'visual' },
 				blockSelection: { start: null, end: null },
 				editor: {
 					blockOrder: [ 1, 2, 3 ],
@@ -1495,7 +1511,7 @@ describe( 'selectors', () => {
 
 		it( 'should return the last block for the text mode', () => {
 			const state = {
-				mode: 'text',
+				preferences: { mode: 'text' },
 				blockSelection: { start: 2, end: 2 },
 				editor: {
 					blockOrder: [ 1, 2, 3 ],
diff --git a/editor/test/store.js b/editor/test/store.js
index b05deb70b0a8e..d46d69675d3a8 100644
--- a/editor/test/store.js
+++ b/editor/test/store.js
@@ -23,7 +23,6 @@ describe( 'store', () => {
 				'isTyping',
 				'blockSelection',
 				'hoveredBlock',
-				'mode',
 				'preferences',
 				'saving',
 				'showInsertionPoint',