diff --git a/locales/en/translation.json b/locales/en/translation.json
index bb5f633d1a..a0a8393b4b 100644
--- a/locales/en/translation.json
+++ b/locales/en/translation.json
@@ -4,6 +4,8 @@
     "export-gist": "Export Gist",
     "export-repo": "Export Repo",
     "share-to-classroom": "Share To Classroom",
+    "add-instructions": "Add Instructions",
+    "edit-instructions": "Edit Instructions",
     "libraries": "Libraries",
     "load-project": "Your Projects",
     "new-project": "New Project",
@@ -60,7 +62,11 @@
         "css": "CSS",
         "javascript": "JS"
       },
-      "output": "Output"
+      "output": "Output",
+      "instructions": {
+        "cancel": "Cancel",
+        "save": "Save"
+      }
     }
   },
   "utility": {
diff --git a/src/actions/index.js b/src/actions/index.js
index 61efc20fe1..3998f368b8 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -15,6 +15,7 @@ import {
   unhideComponent,
   toggleComponent,
   updateProjectSource,
+  updateProjectInstructions,
 } from './projects';
 
 import {
@@ -31,6 +32,8 @@ import {
   toggleEditorTextSize,
   toggleTopBarMenu,
   closeTopBarMenu,
+  startEditingInstructions,
+  cancelEditingInstructions,
 } from './ui';
 
 import {
@@ -67,6 +70,7 @@ export {
   createSnapshot,
   changeCurrentProject,
   updateProjectSource,
+  updateProjectInstructions,
   toggleLibrary,
   userAuthenticated,
   userLoggedOut,
@@ -92,6 +96,8 @@ export {
   toggleEditorTextSize,
   toggleTopBarMenu,
   closeTopBarMenu,
+  startEditingInstructions,
+  cancelEditingInstructions,
   logIn,
   logOut,
   evaluateConsoleEntry,
diff --git a/src/actions/projects.js b/src/actions/projects.js
index e9a662bbc0..0fc760e053 100644
--- a/src/actions/projects.js
+++ b/src/actions/projects.js
@@ -18,6 +18,11 @@ export const updateProjectSource = createAction(
   (_projectKey, _language, _newValue, timestamp = Date.now()) => ({timestamp}),
 );
 
+export const updateProjectInstructions = createAction(
+  'UPDATE_PROJECT_INSTRUCTIONS',
+  (projectKey, newValue) => ({projectKey, newValue}),
+);
+
 export const toggleLibrary = createAction(
   'TOGGLE_LIBRARY',
   (projectKey, libraryKey) => ({projectKey, libraryKey}),
diff --git a/src/actions/ui.js b/src/actions/ui.js
index 9a39434445..09cbb179ff 100644
--- a/src/actions/ui.js
+++ b/src/actions/ui.js
@@ -58,3 +58,11 @@ export const toggleTopBarMenu = createAction(
 export const closeTopBarMenu = createAction(
   'CLOSE_TOP_BAR_MENU',
 );
+
+export const startEditingInstructions = createAction(
+  'START_EDITING_INSTRUCTIONS',
+);
+
+export const cancelEditingInstructions = createAction(
+  'CANCEL_EDITING_INSTRUCTIONS',
+);
diff --git a/src/components/Instructions.jsx b/src/components/Instructions.jsx
index 32068f8e30..050416f68c 100644
--- a/src/components/Instructions.jsx
+++ b/src/components/Instructions.jsx
@@ -1,9 +1,17 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {toReact as markdownToReact} from '../util/markdown';
+import InstructionsEditor from './InstructionsEditor';
 
-export default function Instructions({instructions, isOpen}) {
-  if (!instructions || !isOpen) {
+export default function Instructions({
+  instructions,
+  isEditing,
+  isOpen,
+  projectKey,
+  onCancelEditing,
+  onSaveChanges,
+}) {
+  if (!isEditing && !instructions || !isOpen) {
     return null;
   }
 
@@ -11,14 +19,27 @@ export default function Instructions({instructions, isOpen}) {
     <div
       className="layout__instructions"
     >
-      <div className="instructions">
-        {markdownToReact(instructions)}
-      </div>
+      {
+        isEditing ?
+          <InstructionsEditor
+            instructions={instructions}
+            projectKey={projectKey}
+            onCancelEditing={onCancelEditing}
+            onSaveChanges={onSaveChanges}
+          /> :
+          <div className="instructions">
+            {markdownToReact(instructions)}
+          </div>
+      }
     </div>
   );
 }
 
 Instructions.propTypes = {
   instructions: PropTypes.string.isRequired,
+  isEditing: PropTypes.bool.isRequired,
   isOpen: PropTypes.bool.isRequired,
+  projectKey: PropTypes.string.isRequired,
+  onCancelEditing: PropTypes.func.isRequired,
+  onSaveChanges: PropTypes.func.isRequired,
 };
diff --git a/src/components/InstructionsEditor.jsx b/src/components/InstructionsEditor.jsx
new file mode 100644
index 0000000000..7a678449bd
--- /dev/null
+++ b/src/components/InstructionsEditor.jsx
@@ -0,0 +1,69 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {t} from 'i18next';
+import bindAll from 'lodash/bindAll';
+
+export default class InstructionsEditor extends React.Component {
+  constructor() {
+    super();
+    bindAll(this, '_handleCancelEditing', '_handleSaveChanges', '_ref');
+  }
+
+  _handleCancelEditing() {
+    this.props.onCancelEditing();
+  }
+
+  _handleSaveChanges() {
+    const newValue = this._editor.value.trim();
+    this.props.onSaveChanges(this.props.projectKey, newValue);
+  }
+
+  _ref(editorElement) {
+    this._editor = editorElement;
+  }
+
+  render() {
+    return (
+      <div className="instructions-editor">
+        <div className="instructions-editor__menu">
+          <button
+            className="instructions-editor__menu-button"
+            onClick={this._handleSaveChanges}
+          >
+            {t('workspace.components.instructions.save')}
+          </button>
+          <button
+            className="instructions-editor__menu-button"
+            onClick={this._handleCancelEditing}
+          >
+            {t('workspace.components.instructions.cancel')}
+          </button>
+        </div>
+        <div className="instructions-editor__input-container">
+          <textarea
+            className="instructions-editor__input"
+            defaultValue={this.props.instructions}
+            ref={this._ref}
+          />
+        </div>
+        <div className="instructions-editor__footer">
+          <a
+            className="instructions-editor__footer-link"
+            href="https://guides.github.com/features/mastering-markdown/"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            Styling with Markdown is supported
+          </a>
+        </div>
+      </div>
+    );
+  }
+}
+
+InstructionsEditor.propTypes = {
+  instructions: PropTypes.string.isRequired,
+  projectKey: PropTypes.string.isRequired,
+  onCancelEditing: PropTypes.func.isRequired,
+  onSaveChanges: PropTypes.func.isRequired,
+};
diff --git a/src/components/TopBar/HamburgerMenu.jsx b/src/components/TopBar/HamburgerMenu.jsx
index 11281eef34..9bc999b96e 100644
--- a/src/components/TopBar/HamburgerMenu.jsx
+++ b/src/components/TopBar/HamburgerMenu.jsx
@@ -12,6 +12,8 @@ const HamburgerMenu = createMenu({
   name: 'hamburger',
 
   renderItems({
+    hasInstructions,
+    isEditingInstructions,
     isExperimental,
     isGistExportInProgress,
     isRepoExportInProgress,
@@ -20,6 +22,7 @@ const HamburgerMenu = createMenu({
     onExportGist,
     onExportRepo,
     onExportToClassroom,
+    onStartEditingInstructions,
   }) {
     return tap([], (items) => {
       items.push(
@@ -31,6 +34,20 @@ const HamburgerMenu = createMenu({
         </MenuItem>,
       );
 
+      items.push(
+        <MenuItem
+          isDisabled={isEditingInstructions}
+          key="addOrEditInstructions"
+          onClick={onStartEditingInstructions}
+        >
+          {
+            hasInstructions ?
+              t('top-bar.edit-instructions') :
+              t('top-bar.add-instructions')
+          }
+        </MenuItem>,
+      );
+
       if (isUserAuthenticated) {
         items.push(
           <MenuItem
@@ -96,7 +113,9 @@ const HamburgerMenu = createMenu({
 
 
 HamburgerMenu.propTypes = {
+  hasInstructions: PropTypes.bool.isRequired,
   isClassroomExportInProgress: PropTypes.bool.isRequired,
+  isEditingInstructions: PropTypes.bool.isRequired,
   isExperimental: PropTypes.bool.isRequired,
   isGistExportInProgress: PropTypes.bool.isRequired,
   isOpen: PropTypes.bool.isRequired,
@@ -105,6 +124,7 @@ HamburgerMenu.propTypes = {
   onExportGist: PropTypes.func.isRequired,
   onExportRepo: PropTypes.func.isRequired,
   onExportToClassroom: PropTypes.func.isRequired,
+  onStartEditingInstructions: PropTypes.func.isRequired,
 };
 
 export default HamburgerMenu;
diff --git a/src/components/TopBar/createMenu.jsx b/src/components/TopBar/createMenu.jsx
index 1e4a03423d..060edb4a6a 100644
--- a/src/components/TopBar/createMenu.jsx
+++ b/src/components/TopBar/createMenu.jsx
@@ -3,6 +3,7 @@
 import classnames from 'classnames';
 import {connect} from 'react-redux';
 import constant from 'lodash/constant';
+import noop from 'lodash/noop';
 import onClickOutside from 'react-onclickoutside';
 import preventClickthrough from 'react-prevent-clickthrough';
 import property from 'lodash/property';
@@ -11,13 +12,14 @@ import React from 'react';
 import {closeTopBarMenu, toggleTopBarMenu} from '../../actions';
 import {getOpenTopBarMenu} from '../../selectors';
 
-export function MenuItem({children, isEnabled, onClick}) {
+export function MenuItem({children, isDisabled, isEnabled, onClick}) {
   return (
     <div
-      className={classnames('top-bar__menu-item',
-        {'top-bar__menu-item_active': isEnabled},
-      )}
-      onClick={onClick}
+      className={classnames('top-bar__menu-item', {
+        'top-bar__menu-item_active': isEnabled,
+        'top-bar__menu-item_disabled': isDisabled,
+      })}
+      onClick={isDisabled ? noop : onClick}
     >
       {children}
     </div>
@@ -26,11 +28,13 @@ export function MenuItem({children, isEnabled, onClick}) {
 
 MenuItem.propTypes = {
   children: PropTypes.node.isRequired,
+  isDisabled: PropTypes.bool,
   isEnabled: PropTypes.bool,
   onClick: PropTypes.func.isRequired,
 };
 
 MenuItem.defaultProps = {
+  isDisabled: false,
   isEnabled: false,
 };
 
diff --git a/src/components/TopBar/index.jsx b/src/components/TopBar/index.jsx
index 694772ce96..db438e8321 100644
--- a/src/components/TopBar/index.jsx
+++ b/src/components/TopBar/index.jsx
@@ -29,6 +29,8 @@ export default function TopBar({
   currentProjectKey,
   currentUser,
   enabledLibraries,
+  hasInstructions,
+  isEditingInstructions,
   isExperimental,
   isGistExportInProgress,
   isRepoExportInProgress,
@@ -49,6 +51,7 @@ export default function TopBar({
   onExportRepo,
   onExportToClassroom,
   onLogOut,
+  onStartEditingInstructions,
   onStartLogIn,
   onToggleLibrary,
   onToggleTextSize,
@@ -92,7 +95,9 @@ export default function TopBar({
         onStartLogIn={onStartLogIn}
       />
       <HamburgerMenu
+        hasInstructions={hasInstructions}
         isClassroomExportInProgress={isClassroomExportInProgress}
+        isEditingInstructions={isEditingInstructions}
         isExperimental={isExperimental}
         isGistExportInProgress={isGistExportInProgress}
         isOpen={openMenu === 'hamburger'}
@@ -102,6 +107,7 @@ export default function TopBar({
         onExportGist={onExportGist}
         onExportRepo={onExportRepo}
         onExportToClassroom={onExportToClassroom}
+        onStartEditingInstructions={onStartEditingInstructions}
       />
     </header>
   );
@@ -111,7 +117,9 @@ TopBar.propTypes = {
   currentProjectKey: PropTypes.string,
   currentUser: PropTypes.object.isRequired,
   enabledLibraries: PropTypes.arrayOf(PropTypes.string).isRequired,
+  hasInstructions: PropTypes.bool.isRequired,
   isClassroomExportInProgress: PropTypes.bool.isRequired,
+  isEditingInstructions: PropTypes.bool.isRequired,
   isExperimental: PropTypes.bool.isRequired,
   isGistExportInProgress: PropTypes.bool.isRequired,
   isRepoExportInProgress: PropTypes.bool.isRequired,
@@ -131,6 +139,7 @@ TopBar.propTypes = {
   onExportRepo: PropTypes.func.isRequired,
   onExportToClassroom: PropTypes.func.isRequired,
   onLogOut: PropTypes.func.isRequired,
+  onStartEditingInstructions: PropTypes.func.isRequired,
   onStartLogIn: PropTypes.func.isRequired,
   onToggleLibrary: PropTypes.func.isRequired,
   onToggleTextSize: PropTypes.func.isRequired,
diff --git a/src/components/Workspace.jsx b/src/components/Workspace.jsx
index a302dd984b..8511b79100 100644
--- a/src/components/Workspace.jsx
+++ b/src/components/Workspace.jsx
@@ -11,6 +11,7 @@ import partial from 'lodash/partial';
 import map from 'lodash/map';
 import {t} from 'i18next';
 import qs from 'qs';
+import classnames from 'classnames';
 import {getNodeWidth, getNodeWidths} from '../util/resize';
 import {dehydrateProject, rehydrateProject} from '../clients/localStorage';
 
@@ -29,7 +30,7 @@ import {
 } from '../actions';
 
 import {isPristineProject} from '../util/projectUtils';
-import {getCurrentProject} from '../selectors';
+import {getCurrentProject, isEditingInstructions} from '../selectors';
 
 import TopBar from '../containers/TopBar';
 import Instructions from '../containers/Instructions';
@@ -45,6 +46,7 @@ function mapStateToProps(state) {
     isDraggingColumnDivider: state.getIn(
       ['ui', 'workspace', 'isDraggingColumnDivider'],
     ),
+    isEditingInstructions: isEditingInstructions(state),
     isUserTyping: state.getIn(['ui', 'editors', 'typing']),
     editorsFlex: state.getIn(['ui', 'workspace', 'columnFlex']).toJS(),
     rowsFlex: state.getIn(['ui', 'workspace', 'rowFlex']).toJS(),
@@ -184,23 +186,36 @@ class Workspace extends React.Component {
   }
 
   _handleClickInstructionsBar() {
-    this.props.dispatch(toggleComponent(
-      get(this.props, ['currentProject', 'projectKey']),
-      'instructions',
-    ));
+    if (!this.props.isEditingInstructions) {
+      this.props.dispatch(toggleComponent(
+        get(this.props, ['currentProject', 'projectKey']),
+        'instructions',
+      ));
+    }
   }
 
   _renderInstructionsBar() {
-    if (!get(this.props, ['currentProject', 'instructions'])) {
+    const currentInstructions = get(
+      this.props,
+      ['currentProject', 'instructions'],
+    );
+    if (!this.props.isEditingInstructions && !currentInstructions) {
       return null;
     }
 
     return (
       <div
-        className="layout__instructions-bar"
+        className={classnames('layout__instructions-bar', {
+          'layout__instructions-bar_disabled':
+            this.props.isEditingInstructions,
+        })}
         onClick={this._handleClickInstructionsBar}
       >
-        <span className="u__icon">&#xf05a;</span>
+        <span
+          className={classnames('u__icon', {
+            u__icon_disabled: this.props.isEditingInstructions,
+          })}
+        >&#xf05a;</span>
       </div>
     );
   }
@@ -296,6 +311,7 @@ Workspace.propTypes = {
   editorsFlex: PropTypes.array.isRequired,
   errors: PropTypes.object.isRequired,
   isDraggingColumnDivider: PropTypes.bool.isRequired,
+  isEditingInstructions: PropTypes.bool.isRequired,
   isUserTyping: PropTypes.bool,
   rowsFlex: PropTypes.array.isRequired,
   ui: PropTypes.object.isRequired,
diff --git a/src/containers/Instructions.js b/src/containers/Instructions.js
index cd3758b6db..b055d902a8 100644
--- a/src/containers/Instructions.js
+++ b/src/containers/Instructions.js
@@ -2,16 +2,36 @@ import {connect} from 'react-redux';
 import Instructions from '../components/Instructions';
 import {
   getCurrentProjectInstructions,
+  getCurrentProjectKey,
   getHiddenUIComponents,
+  isEditingInstructions,
 } from '../selectors';
+import {
+  cancelEditingInstructions,
+  updateProjectInstructions,
+} from '../actions';
 
 function mapStateToProps(state) {
   return {
     instructions: getCurrentProjectInstructions(state),
+    isEditing: isEditingInstructions(state),
     isOpen: !getHiddenUIComponents(state).includes('instructions'),
+    projectKey: getCurrentProjectKey(state),
+  };
+}
+
+function mapDispatchToProps(dispatch) {
+  return {
+    onCancelEditing() {
+      dispatch(cancelEditingInstructions());
+    },
+    onSaveChanges(projectKey, newValue) {
+      dispatch(updateProjectInstructions(projectKey, newValue));
+    },
   };
 }
 
 export default connect(
   mapStateToProps,
+  mapDispatchToProps,
 )(Instructions);
diff --git a/src/containers/TopBar.js b/src/containers/TopBar.js
index b95197a525..41d154cb4c 100644
--- a/src/containers/TopBar.js
+++ b/src/containers/TopBar.js
@@ -2,11 +2,13 @@ import {connect} from 'react-redux';
 import TopBar from '../components/TopBar';
 import {
   getCurrentProjectKey,
+  getCurrentProjectInstructions,
   getCurrentUser,
   getCurrentValidationState,
   getEnabledLibraries,
   getOpenTopBarMenu,
   getAllProjectKeys,
+  isEditingInstructions,
   isExperimental,
   isGistExportInProgress,
   isRepoExportInProgress,
@@ -22,6 +24,7 @@ import {
   createProject,
   createSnapshot,
   exportProject,
+  startEditingInstructions,
   toggleEditorTextSize,
   toggleLibrary,
   toggleTopBarMenu,
@@ -34,6 +37,8 @@ function mapStateToProps(state) {
     currentProjectKey: getCurrentProjectKey(state),
     currentUser: getCurrentUser(state),
     enabledLibraries: getEnabledLibraries(state),
+    hasInstructions: Boolean(getCurrentProjectInstructions(state)),
+    isEditingInstructions: isEditingInstructions(state),
     isExperimental: isExperimental(state),
     isGistExportInProgress: isGistExportInProgress(state),
     isRepoExportInProgress: isRepoExportInProgress(state),
@@ -90,6 +95,10 @@ function mapDispatchToProps(dispatch) {
       dispatch(logOut());
     },
 
+    onStartEditingInstructions() {
+      dispatch(startEditingInstructions());
+    },
+
     onStartLogIn() {
       dispatch(logIn());
     },
diff --git a/src/css/application.css b/src/css/application.css
index 9ee317486a..c4b8e7424a 100644
--- a/src/css/application.css
+++ b/src/css/application.css
@@ -124,6 +124,10 @@ body {
   padding: 0.25em;
 }
 
+.layout__instructions-bar_disabled {
+  cursor: default;
+}
+
 .layout__main {
   flex: 1 1 100vw;
   position: relative;
@@ -272,7 +276,7 @@ body {
   padding-right: 0.75em;
 }
 
-.top-bar__menu-item:hover:not(.top-bar__menu-item_active) {
+.top-bar__menu-item:hover:not(.top-bar__menu-item_active):not(.top-bar__menu-item_disabled) {
   background-color: var(--color-low-contrast-gray);
 }
 
@@ -285,6 +289,12 @@ body {
   font-weight: bold;
 }
 
+.top-bar__menu-item_disabled {
+  font-style: italic;
+  color: var(--color-gray);
+  cursor: default;
+}
+
 .top-bar__drop-down-button {
   padding-left: 0.5em;
 }
@@ -342,6 +352,57 @@ body {
   }
 }
 
+/** @define instructions-editor */
+
+.instructions-editor {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  background-color: var(--color-low-contrast-gray);
+}
+
+.instructions-editor__input-container {
+  position: relative;
+  width: 100%;
+  flex-grow: 1;
+  overflow-y: scroll;
+}
+
+.instructions-editor__input {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  width: 100%;
+  height: 100%;
+  padding: 0.5rem;
+  box-sizing: border-box;
+  font-size: 1rem;
+  border: 0;
+  outline: 0;
+  word-wrap: break-word;
+  white-space: pre-wrap;
+  resize: none;
+}
+
+.instructions-editor__menu {
+  padding: 0.5rem;
+  text-align: right;
+  background-color: var(--color-light-gray);
+}
+
+.instructions-editor__footer {
+  margin: 0.5rem;
+  font-size: 0.875rem;
+}
+
+.instructions-editor__footer-link {
+  color: black;
+}
+
+.instructions-editor__menu-button:not(:last-child) {
+  margin-right: 0.5em;
+}
+
 /** @define project-preview */
 
 .project-preview__label {
@@ -799,3 +860,7 @@ body {
   user-select: none;
   text-decoration: none;
 }
+
+.u__icon_disabled {
+  cursor: default;
+}
diff --git a/src/reducers/projects.js b/src/reducers/projects.js
index abc2e2c3ef..8de0ac4c44 100644
--- a/src/reducers/projects.js
+++ b/src/reducers/projects.js
@@ -115,6 +115,12 @@ export default function reduceProjects(stateIn, action) {
         action.meta.timestamp,
       );
 
+    case 'UPDATE_PROJECT_INSTRUCTIONS':
+      return state.setIn(
+        [action.payload.projectKey, 'instructions'],
+        action.payload.newValue,
+      );
+
     case 'PROJECT_CREATED':
       return removePristineExcept(state, action.payload.projectKey).set(
         action.payload.projectKey,
diff --git a/src/reducers/ui.js b/src/reducers/ui.js
index 1fc92c4a6b..aa5d586636 100644
--- a/src/reducers/ui.js
+++ b/src/reducers/ui.js
@@ -11,6 +11,7 @@ export const DEFAULT_WORKSPACE = new Immutable.Map({
   columnFlex: DEFAULT_COLUMN_FLEX,
   rowFlex: DEFAULT_ROW_FLEX,
   isDraggingColumnDivider: false,
+  isEditingInstructions: false,
 });
 
 const defaultState = new Immutable.Map().
@@ -220,6 +221,13 @@ export default function ui(stateIn, action) {
     case 'PROJECT_COMPILED':
       return dismissNotification(state, 'project-compilation-failed');
 
+    case 'START_EDITING_INSTRUCTIONS':
+      return state.setIn(['workspace', 'isEditingInstructions'], true);
+
+    case 'CANCEL_EDITING_INSTRUCTIONS':
+    case 'UPDATE_PROJECT_INSTRUCTIONS':
+      return state.setIn(['workspace', 'isEditingInstructions'], false);
+
     default:
       return state;
   }
diff --git a/src/selectors/index.js b/src/selectors/index.js
index 3ee0136bff..68eb175b62 100644
--- a/src/selectors/index.js
+++ b/src/selectors/index.js
@@ -19,6 +19,7 @@ import getRequestedFocusedLine from './getRequestedFocusedLine';
 import isCurrentlyValidating from './isCurrentlyValidating';
 import isCurrentProjectSyntacticallyValid
   from './isCurrentProjectSyntacticallyValid';
+import isEditingInstructions from './isEditingInstructions';
 import isExperimental from './isExperimental';
 import isGistExportInProgress from './isGistExportInProgress';
 import isRepoExportInProgress from './isRepoExportInProgress';
@@ -50,6 +51,7 @@ export {
   getRequestedFocusedLine,
   isCurrentlyValidating,
   isCurrentProjectSyntacticallyValid,
+  isEditingInstructions,
   isExperimental,
   isGistExportInProgress,
   isRepoExportInProgress,
diff --git a/src/selectors/isEditingInstructions.js b/src/selectors/isEditingInstructions.js
new file mode 100644
index 0000000000..c796881d30
--- /dev/null
+++ b/src/selectors/isEditingInstructions.js
@@ -0,0 +1,3 @@
+export default function isEditingInstructions(state) {
+  return state.getIn(['ui', 'workspace', 'isEditingInstructions']);
+}
diff --git a/test/unit/reducers/projects.js b/test/unit/reducers/projects.js
index 7f7f60b198..e6b0dea901 100644
--- a/test/unit/reducers/projects.js
+++ b/test/unit/reducers/projects.js
@@ -21,6 +21,7 @@ import {
   unhideComponent,
   toggleComponent,
   updateProjectSource,
+  updateProjectInstructions,
 } from '../../../src/actions/projects';
 import {
   snapshotImported,
@@ -65,6 +66,17 @@ test('updateProjectSource', reducerTest(
     ),
 ));
 
+tap(initProjects({1: false}), projects =>
+  test('updateProjectInstructions', reducerTest(
+    reducer,
+    projects,
+    partial(updateProjectInstructions, '1', '# Instructions\n\nHello.'),
+    projects.update('1', projectIn =>
+      projectIn.set('instructions', '# Instructions\n\nHello.'),
+    ),
+  )),
+);
+
 test('changeCurrentProject', (t) => {
   t.test('from modified to pristine', reducerTest(
     reducer,
diff --git a/test/unit/reducers/ui.js b/test/unit/reducers/ui.js
index 222dbc7e19..c0f456869f 100644
--- a/test/unit/reducers/ui.js
+++ b/test/unit/reducers/ui.js
@@ -8,6 +8,7 @@ import {
   gistNotFound,
   gistImportError,
   updateProjectSource,
+  updateProjectInstructions,
 } from '../../../src/actions/projects';
 import {
   dragColumnDivider,
@@ -18,6 +19,8 @@ import {
   notificationTriggered,
   userDismissedNotification,
   toggleTopBarMenu,
+  startEditingInstructions,
+  cancelEditingInstructions,
 } from '../../../src/actions/ui';
 import {
   snapshotCreated,
@@ -124,6 +127,27 @@ test('dragRowDivider', (t) => {
   ));
 });
 
+test('startEditingInstructions', reducerTest(
+  reducer,
+  initialState,
+  startEditingInstructions,
+  initialState.setIn(['workspace', 'isEditingInstructions'], true),
+));
+
+test('startEditingInstructions', reducerTest(
+  reducer,
+  initialState.setIn(['workspace', 'isEditingInstructions'], true),
+  cancelEditingInstructions,
+  initialState,
+));
+
+test('updateProjectInstructions', reducerTest(
+  reducer,
+  initialState.setIn(['workspace', 'isEditingInstructions'], true),
+  updateProjectInstructions,
+  initialState,
+));
+
 test('gistNotFound', reducerTest(
   reducer,
   initialState,