diff --git a/haskell-cabal.el b/haskell-cabal.el
index 91c75051a..dfe6dfed6 100644
--- a/haskell-cabal.el
+++ b/haskell-cabal.el
@@ -116,29 +116,22 @@
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.cabal\\'" . haskell-cabal-mode))
 
+(defvar haskell-cabal-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "C-c C-s") 'haskell-cabal-subsection-arrange-lines)
+    (define-key map (kbd "C-M-n") 'haskell-cabal-next-section)
+    (define-key map (kbd "C-M-p") 'haskell-cabal-previous-section)
+    (define-key map (kbd "M-n") 'haskell-cabal-next-subsection)
+    (define-key map (kbd "M-p") 'haskell-cabal-previous-subsection)
+    (define-key map (kbd "C-<down>") 'haskell-cabal-next-subsection)
+    (define-key map (kbd "C-<up>") 'haskell-cabal-previous-subsection)
+    (define-key map (kbd "C-c C-f") 'haskell-cabal-find-or-create-source-file)
+    (define-key map (kbd "M-g l") 'haskell-cabal-goto-library-section)
+    (define-key map (kbd "M-g e") 'haskell-cabal-goto-executable-section)
+    (define-key map (kbd "M-g b") 'haskell-cabal-goto-benchmark-section)
+    (define-key map (kbd "M-g t") 'haskell-cabal-goto-test-suite-section)
+    map))
 (defvar haskell-cabal-mode-map (make-sparse-keymap))
-(define-key haskell-cabal-mode-map  (kbd "C-c s")
-  'haskell-cabal-subsection-arrange-lines)
-(define-key haskell-cabal-mode-map  (kbd "C-M-n") 'haskell-cabal-next-section)
-(define-key haskell-cabal-mode-map  (kbd "C-M-p")
-  'haskell-cabal-previous-section)
-(define-key haskell-cabal-mode-map  (kbd "M-n") 'haskell-cabal-next-subsection)
-(define-key haskell-cabal-mode-map  (kbd "M-p")
-  'haskell-cabal-previous-subsection)
-(define-key haskell-cabal-mode-map  (kbd "C-<down>")
-  'haskell-cabal-next-subsection)
-(define-key haskell-cabal-mode-map  (kbd "C-<up>")
-  'haskell-cabal-previous-subsection)
-(define-key haskell-cabal-mode-map  (kbd "C-c f")
-  'haskell-cabal-find-or-create-source-file)
-(define-key haskell-cabal-mode-map  (kbd "M-g l")
-  'haskell-cabal-goto-library-section)
-(define-key haskell-cabal-mode-map  (kbd "M-g e")
-  'haskell-cabal-goto-executable-section)
-(define-key haskell-cabal-mode-map  (kbd "M-g b")
-  'haskell-cabal-goto-benchmark-section)
-(define-key haskell-cabal-mode-map  (kbd "M-g t")
-  'haskell-cabal-goto-test-suite-section)
 
 ;;;###autoload
 (define-derived-mode haskell-cabal-mode fundamental-mode "Haskell-Cabal"